diff -r 30113bfbe723 -r b3afb9f1e801 lib/vpwtable/Makefile.in --- a/lib/vpwtable/Makefile.in Sun Jan 20 00:12:17 2008 +0100 +++ b/lib/vpwtable/Makefile.in Sun Jan 20 00:22:09 2008 +0100 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -46,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -58,12 +57,15 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ CC = @CC@ -CDBPROGS = @CDBPROGS@ -CDBSCRIPTS = @CDBSCRIPTS@ CXX = @CXX@ +HAVE_LIB = @HAVE_LIB@ HTML2TXT = @HTML2TXT@ +LIB = @LIB@ LN = @LN@ +LTLIB = @LTLIB@ LYNX = @LYNX@ MAKEINFO = @MAKEINFO@ MKDIR = @MKDIR@ @@ -83,14 +85,14 @@ noinst_LIBRARIES = libvpwtable.a INCLUDES = -I.. -EXTRA_DIST = vpwtable.h cdb_vpwtable.cc cdb_del.cc cdb_exists.cc cdb_getbyname.cc cdb_put.cc cdb_read.cc gdbm_vpwtable.cc gdbm_del.cc gdbm_exists.cc gdbm_getbyname.cc gdbm_put.cc gdbm_read.cc +EXTRA_DIST = vpwtable.h cdb_vpwtable.cc cdb_del.cc cdb_exists.cc cdb_getbyname.cc cdb_put.cc cdb_read.cc cdb_write.cc gdbm_vpwtable.cc gdbm_del.cc gdbm_exists.cc gdbm_getbyname.cc gdbm_put.cc gdbm_read.cc gdbm_write.cc -@VPWTABLE_CDB_TRUE@CDBSOURCES = cdb_vpwtable.cc cdb_del.cc cdb_exists.cc cdb_getbyname.cc cdb_put.cc cdb_read.cc +@VPWTABLE_CDB_TRUE@CDBSOURCES = cdb_vpwtable.cc cdb_del.cc cdb_exists.cc cdb_getbyname.cc cdb_put.cc cdb_read.cc cdb_write.cc @VPWTABLE_CDB_FALSE@CDBSOURCES = -@VPWTABLE_GDBM_TRUE@GDBMSOURCES = gdbm_vpwtable.cc gdbm_del.cc gdbm_exists.cc gdbm_getbyname.cc gdbm_put.cc gdbm_read.cc +@VPWTABLE_GDBM_TRUE@GDBMSOURCES = gdbm_vpwtable.cc gdbm_del.cc gdbm_exists.cc gdbm_getbyname.cc gdbm_put.cc gdbm_read.cc gdbm_write.cc @VPWTABLE_GDBM_FALSE@GDBMSOURCES = -libvpwtable_a_SOURCES = $(CDBSOURCES) $(GDBMSOURCES) reader.cc +libvpwtable_a_SOURCES = $(CDBSOURCES) $(GDBMSOURCES) reader.cc writer.cc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -103,23 +105,26 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libvpwtable_a_LIBADD = -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_TRUE@libvpwtable_a_OBJECTS = \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_TRUE@cdb_vpwtable.o cdb_del.o \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_TRUE@cdb_exists.o cdb_getbyname.o \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_TRUE@cdb_put.o cdb_read.o \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_TRUE@gdbm_vpwtable.o gdbm_del.o \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_TRUE@gdbm_exists.o gdbm_getbyname.o \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_TRUE@gdbm_put.o gdbm_read.o reader.o -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_FALSE@libvpwtable_a_OBJECTS = \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_FALSE@cdb_vpwtable.o cdb_del.o \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_FALSE@cdb_exists.o cdb_getbyname.o \ -@VPWTABLE_CDB_TRUE@@VPWTABLE_GDBM_FALSE@cdb_put.o cdb_read.o reader.o -@VPWTABLE_CDB_FALSE@@VPWTABLE_GDBM_TRUE@libvpwtable_a_OBJECTS = \ -@VPWTABLE_CDB_FALSE@@VPWTABLE_GDBM_TRUE@gdbm_vpwtable.o gdbm_del.o \ -@VPWTABLE_CDB_FALSE@@VPWTABLE_GDBM_TRUE@gdbm_exists.o gdbm_getbyname.o \ -@VPWTABLE_CDB_FALSE@@VPWTABLE_GDBM_TRUE@gdbm_put.o gdbm_read.o reader.o -@VPWTABLE_CDB_FALSE@@VPWTABLE_GDBM_FALSE@libvpwtable_a_OBJECTS = \ -@VPWTABLE_CDB_FALSE@@VPWTABLE_GDBM_FALSE@reader.o +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_FALSE@libvpwtable_a_OBJECTS = \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_FALSE@gdbm_vpwtable.o gdbm_del.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_FALSE@gdbm_exists.o gdbm_getbyname.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_FALSE@gdbm_put.o gdbm_read.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_FALSE@gdbm_write.o reader.o writer.o +@VPWTABLE_GDBM_FALSE@@VPWTABLE_CDB_TRUE@libvpwtable_a_OBJECTS = \ +@VPWTABLE_GDBM_FALSE@@VPWTABLE_CDB_TRUE@cdb_vpwtable.o cdb_del.o \ +@VPWTABLE_GDBM_FALSE@@VPWTABLE_CDB_TRUE@cdb_exists.o cdb_getbyname.o \ +@VPWTABLE_GDBM_FALSE@@VPWTABLE_CDB_TRUE@cdb_put.o cdb_read.o \ +@VPWTABLE_GDBM_FALSE@@VPWTABLE_CDB_TRUE@cdb_write.o reader.o writer.o +@VPWTABLE_GDBM_FALSE@@VPWTABLE_CDB_FALSE@libvpwtable_a_OBJECTS = \ +@VPWTABLE_GDBM_FALSE@@VPWTABLE_CDB_FALSE@reader.o writer.o +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@libvpwtable_a_OBJECTS = \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@cdb_vpwtable.o cdb_del.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@cdb_exists.o cdb_getbyname.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@cdb_put.o cdb_read.o cdb_write.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@gdbm_vpwtable.o gdbm_del.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@gdbm_exists.o gdbm_getbyname.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@gdbm_put.o gdbm_read.o \ +@VPWTABLE_GDBM_TRUE@@VPWTABLE_CDB_TRUE@gdbm_write.o reader.o writer.o AR = ar CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -130,7 +135,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best SOURCES = $(libvpwtable_a_SOURCES) OBJECTS = $(libvpwtable_a_OBJECTS) @@ -235,11 +240,6 @@ ../mystring/join.h ../misc/strlist.h ../vpwentry/vpwentry.h \ ../cdb++/cdb++.h ../cdb++/datum.h ../fdbuf/fdbuf.h \ ../fdbuf/fdibuf.h ../fdbuf/fdobuf.h -cdb_get.o: cdb_get.cc ../../config.h ../misc/autodelete.h \ - ../cdb++/cdb++.h ../mystring/mystring.h ../mystring/rep.h \ - ../mystring/iter.h ../mystring/join.h ../cdb++/datum.h \ - ../fdbuf/fdbuf.h ../fdbuf/fdibuf.h ../fdbuf/fdobuf.h vpwtable.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h cdb_getbyname.o: cdb_getbyname.cc ../../config.h vpwtable.h \ ../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \ ../mystring/join.h ../misc/strlist.h ../vpwentry/vpwentry.h \ @@ -260,62 +260,17 @@ ../mystring/join.h ../misc/strlist.h ../vpwentry/vpwentry.h \ ../vdomain/vdomain.h ../config/configrc.h ../misc/pwentry.h \ ../vpwtable/vpwtable.h ../misc/response.h -del.o: del.cc ../../config.h vpwtable.h ../mystring/mystring.h \ - ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h ../cdb++/cdb++.h \ - ../cdb++/datum.h ../fdbuf/fdbuf.h ../fdbuf/fdibuf.h \ - ../fdbuf/fdobuf.h -exists.o: exists.cc ../../config.h vpwtable.h ../mystring/mystring.h \ - ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h ../cdb++/cdb++.h \ - ../cdb++/datum.h ../fdbuf/fdbuf.h ../fdbuf/fdibuf.h \ - ../fdbuf/fdobuf.h -gdbm_del.o: gdbm_del.cc ../../config.h vpwtable.h ../mystring/mystring.h \ - ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h -gdbm_exists.o: gdbm_exists.cc ../../config.h vpwtable.h \ - ../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \ - ../mystring/join.h ../misc/strlist.h ../vpwentry/vpwentry.h -gdbm_get.o: gdbm_get.cc ../../config.h vpwtable.h ../mystring/mystring.h \ - ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h -gdbm_getbyname.o: gdbm_getbyname.cc ../../config.h vpwtable.h \ - ../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \ - ../mystring/join.h ../misc/strlist.h ../vpwentry/vpwentry.h -gdbm_put.o: gdbm_put.cc ../../config.h vpwtable.h ../mystring/mystring.h \ - ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h -gdbm_read.o: gdbm_read.cc ../../config.h vpwtable.h \ - ../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \ - ../mystring/join.h ../misc/strlist.h ../vpwentry/vpwentry.h -gdbm_vpwtable.o: gdbm_vpwtable.cc ../../config.h vpwtable.h \ +cdb_write.o: cdb_write.cc ../../config.h vpwtable.h \ ../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \ ../mystring/join.h ../misc/strlist.h ../vpwentry/vpwentry.h \ - ../vdomain/vdomain.h ../config/configrc.h ../misc/pwentry.h \ - ../vpwtable/vpwtable.h ../misc/response.h -get.o: get.cc ../../config.h ../misc/autodelete.h ../cdb++/cdb++.h \ - ../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \ - ../mystring/join.h ../cdb++/datum.h ../fdbuf/fdbuf.h \ - ../fdbuf/fdibuf.h ../fdbuf/fdobuf.h vpwtable.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h -getbyname.o: getbyname.cc ../../config.h ../cdb++/cdb++.h \ - ../mystring/mystring.h ../mystring/rep.h ../mystring/iter.h \ - ../mystring/join.h ../cdb++/datum.h ../fdbuf/fdbuf.h \ - ../fdbuf/fdibuf.h ../fdbuf/fdobuf.h vpwtable.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h -put.o: put.cc ../../config.h vpwtable.h ../mystring/mystring.h \ - ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h ../cdb++/cdb++.h \ - ../cdb++/datum.h ../fdbuf/fdbuf.h ../fdbuf/fdibuf.h \ - ../fdbuf/fdobuf.h + ../cdb++/cdb++.h ../cdb++/datum.h ../fdbuf/fdbuf.h \ + ../fdbuf/fdibuf.h ../fdbuf/fdobuf.h reader.o: reader.cc ../../config.h vpwtable.h ../mystring/mystring.h \ ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ ../misc/strlist.h ../vpwentry/vpwentry.h -vpwtable.o: vpwtable.cc ../../config.h vpwtable.h ../mystring/mystring.h \ +writer.o: writer.cc ../../config.h vpwtable.h ../mystring/mystring.h \ ../mystring/rep.h ../mystring/iter.h ../mystring/join.h \ - ../misc/strlist.h ../vpwentry/vpwentry.h ../vdomain/vdomain.h \ - ../config/configrc.h ../misc/pwentry.h ../vpwtable/vpwtable.h \ - ../misc/response.h + ../misc/strlist.h ../vpwentry/vpwentry.h info-am: info: info-am @@ -339,7 +294,7 @@ all-am: Makefile $(LIBRARIES) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: