diff -r 30113bfbe723 -r b3afb9f1e801 commands/Makefile.in --- a/commands/Makefile.in Sun Jan 20 00:12:17 2008 +0100 +++ b/commands/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@ @@ -81,26 +83,26 @@ phpdir = @phpdir@ pythonlibdir = @pythonlibdir@ -bin_PROGRAMS = @CDBPROGS@ listvdomain vadduser vaddusers vchattr vchforwards vcheckquota vdeliver vdeluser vpasswd vpasswd2db vpasswds vpopbull vsetup +bin_PROGRAMS = dumpvuser listvdomain vadduser vaddusers vchattr vchforwards vdeliver vdeluser vpasswd vpasswds vrehash vsetup vupgrade -bin_SCRIPTS = @CDBSCRIPTS@ vaddalias vconf2dir +bin_SCRIPTS = vaddalias vconf2dir noinst_HEADERS = vcommand.h -noinst_PODS = vpasswd2cdb.pod vrehash.pod listvdomain.pod vadduser.pod vadduser.pod vchattr.pod vchforwards.pod vcheckquota.pod vdeliver.pod vdeluser.pod vpasswd.pod vpasswd2db.pod vpasswds.pod vpopbull.pod vsetup.pod +noinst_PODS = dumpvuser.pod listvdomain.pod vadduser.pod vadduser.pod vchattr.pod vchforwards.pod vdeliver.pod vdeluser.pod vpasswd.pod vpasswds.pod vrehash.pod vsetup.pod vupgrade.pod noinst_HTMLS = $(noinst_PODS:.pod=.html) man_MANS = $(noinst_PODS:.pod=.1) CLEANFILES = $(man_MANS) $(noinst_HTMLS) $(noinst_PODS) pod2html-dircache pod2html-itemcache -EXTRA_DIST = $(man_MANS) $(noinst_HTMLS) $(noinst_PODS) $(bin_SCRIPTS) vpasswd2cdb.cc vrehash.cc +EXTRA_DIST = $(man_MANS) $(noinst_HTMLS) $(noinst_PODS) $(bin_SCRIPTS) +EXTRA_SCRIPTS = vupgrade-all -EXTRA_PROGRAMS = vpasswd2cdb vrehash -EXTRA_SCRIPTS = allvpasswd2cdb +INCLUDES = -I../lib -DBINDIR=\"@bindir@\" -CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@ -INCLUDES = -I../lib -DBINDIR=\"@bindir@\" +dumpvuser_SOURCES = dumpvuser.cc vcommand.cc +dumpvuser_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a listvdomain_SOURCES = listvdomain.cc vcommand.cc listvdomain_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a @@ -114,9 +116,6 @@ vchattr_SOURCES = vchattr.cc vcommand.cc vchattr_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a -vcheckquota_SOURCES = vcheckquota.cc -vcheckquota_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a - vchforwards_SOURCES = vchforwards.cc vcommand.cc vchforwards_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a @@ -132,20 +131,14 @@ vpasswds_SOURCES = vpasswds.cc vcommand.cc vpasswds_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a -vpasswd2db_SOURCES = vpasswd2db.cc vcommand.cc -vpasswd2db_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a - -vpopbull_SOURCES = vpopbull.cc vcommand.cc -vpopbull_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a +vupgrade_SOURCES = vupgrade.cc vcommand.cc +vupgrade_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a vsetup_SOURCES = vsetup.cc vcommand.cc vsetup_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a -@VPWTABLE_CDB_TRUE@vpasswd2cdb_SOURCES = vpasswd2cdb.cc vcommand.cc -@VPWTABLE_CDB_TRUE@vpasswd2cdb_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a - -@VPWTABLE_CDB_TRUE@vrehash_SOURCES = vrehash.cc vcommand.cc -@VPWTABLE_CDB_TRUE@vrehash_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a +vrehash_SOURCES = vrehash.cc vcommand.cc +vrehash_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -156,14 +149,9 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -@VPWTABLE_CDB_TRUE@vpasswd2cdb_OBJECTS = vpasswd2cdb.o vcommand.o -@VPWTABLE_CDB_TRUE@vpasswd2cdb_DEPENDENCIES = ../lib/libcli.a \ -@VPWTABLE_CDB_TRUE@../lib/libvmailmgr.a -vpasswd2cdb_LDFLAGS = -@VPWTABLE_CDB_TRUE@vrehash_OBJECTS = vrehash.o vcommand.o -@VPWTABLE_CDB_TRUE@vrehash_DEPENDENCIES = ../lib/libcli.a \ -@VPWTABLE_CDB_TRUE@../lib/libvmailmgr.a -vrehash_LDFLAGS = +dumpvuser_OBJECTS = dumpvuser.o vcommand.o +dumpvuser_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a +dumpvuser_LDFLAGS = listvdomain_OBJECTS = listvdomain.o vcommand.o listvdomain_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a listvdomain_LDFLAGS = @@ -179,9 +167,6 @@ vchforwards_OBJECTS = vchforwards.o vcommand.o vchforwards_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a vchforwards_LDFLAGS = -vcheckquota_OBJECTS = vcheckquota.o -vcheckquota_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a -vcheckquota_LDFLAGS = vdeliver_OBJECTS = vdeliver.o vcommand.o vdeliver_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a vdeliver_LDFLAGS = @@ -191,23 +176,24 @@ vpasswd_OBJECTS = vpasswd.o vcommand.o vpasswd_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a vpasswd_LDFLAGS = -vpasswd2db_OBJECTS = vpasswd2db.o vcommand.o -vpasswd2db_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a -vpasswd2db_LDFLAGS = vpasswds_OBJECTS = vpasswds.o vcommand.o vpasswds_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a vpasswds_LDFLAGS = -vpopbull_OBJECTS = vpopbull.o vcommand.o -vpopbull_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a -vpopbull_LDFLAGS = +vrehash_OBJECTS = vrehash.o vcommand.o +vrehash_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a +vrehash_LDFLAGS = vsetup_OBJECTS = vsetup.o vcommand.o vsetup_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a vsetup_LDFLAGS = +vupgrade_OBJECTS = vupgrade.o vcommand.o +vupgrade_DEPENDENCIES = ../lib/libcli.a ../lib/libvmailmgr.a +vupgrade_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ man1dir = $(mandir)/man1 MANS = $(man_MANS) @@ -219,10 +205,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best -SOURCES = $(vpasswd2cdb_SOURCES) $(vrehash_SOURCES) $(listvdomain_SOURCES) $(vadduser_SOURCES) $(vaddusers_SOURCES) $(vchattr_SOURCES) $(vchforwards_SOURCES) $(vcheckquota_SOURCES) $(vdeliver_SOURCES) $(vdeluser_SOURCES) $(vpasswd_SOURCES) $(vpasswd2db_SOURCES) $(vpasswds_SOURCES) $(vpopbull_SOURCES) $(vsetup_SOURCES) -OBJECTS = $(vpasswd2cdb_OBJECTS) $(vrehash_OBJECTS) $(listvdomain_OBJECTS) $(vadduser_OBJECTS) $(vaddusers_OBJECTS) $(vchattr_OBJECTS) $(vchforwards_OBJECTS) $(vcheckquota_OBJECTS) $(vdeliver_OBJECTS) $(vdeluser_OBJECTS) $(vpasswd_OBJECTS) $(vpasswd2db_OBJECTS) $(vpasswds_OBJECTS) $(vpopbull_OBJECTS) $(vsetup_OBJECTS) +SOURCES = $(dumpvuser_SOURCES) $(listvdomain_SOURCES) $(vadduser_SOURCES) $(vaddusers_SOURCES) $(vchattr_SOURCES) $(vchforwards_SOURCES) $(vdeliver_SOURCES) $(vdeluser_SOURCES) $(vpasswd_SOURCES) $(vpasswds_SOURCES) $(vrehash_SOURCES) $(vsetup_SOURCES) $(vupgrade_SOURCES) +OBJECTS = $(dumpvuser_OBJECTS) $(listvdomain_OBJECTS) $(vadduser_OBJECTS) $(vaddusers_OBJECTS) $(vchattr_OBJECTS) $(vchforwards_OBJECTS) $(vdeliver_OBJECTS) $(vdeluser_OBJECTS) $(vpasswd_OBJECTS) $(vpasswds_OBJECTS) $(vrehash_OBJECTS) $(vsetup_OBJECTS) $(vupgrade_OBJECTS) all: all-redirect .SUFFIXES: @@ -249,8 +235,8 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -279,13 +265,9 @@ maintainer-clean-compile: -vpasswd2cdb: $(vpasswd2cdb_OBJECTS) $(vpasswd2cdb_DEPENDENCIES) - @rm -f vpasswd2cdb - $(CXXLINK) $(vpasswd2cdb_LDFLAGS) $(vpasswd2cdb_OBJECTS) $(vpasswd2cdb_LDADD) $(LIBS) - -vrehash: $(vrehash_OBJECTS) $(vrehash_DEPENDENCIES) - @rm -f vrehash - $(CXXLINK) $(vrehash_LDFLAGS) $(vrehash_OBJECTS) $(vrehash_LDADD) $(LIBS) +dumpvuser: $(dumpvuser_OBJECTS) $(dumpvuser_DEPENDENCIES) + @rm -f dumpvuser + $(CXXLINK) $(dumpvuser_LDFLAGS) $(dumpvuser_OBJECTS) $(dumpvuser_LDADD) $(LIBS) listvdomain: $(listvdomain_OBJECTS) $(listvdomain_DEPENDENCIES) @rm -f listvdomain @@ -307,10 +289,6 @@ @rm -f vchforwards $(CXXLINK) $(vchforwards_LDFLAGS) $(vchforwards_OBJECTS) $(vchforwards_LDADD) $(LIBS) -vcheckquota: $(vcheckquota_OBJECTS) $(vcheckquota_DEPENDENCIES) - @rm -f vcheckquota - $(CXXLINK) $(vcheckquota_LDFLAGS) $(vcheckquota_OBJECTS) $(vcheckquota_LDADD) $(LIBS) - vdeliver: $(vdeliver_OBJECTS) $(vdeliver_DEPENDENCIES) @rm -f vdeliver $(CXXLINK) $(vdeliver_LDFLAGS) $(vdeliver_OBJECTS) $(vdeliver_LDADD) $(LIBS) @@ -323,22 +301,22 @@ @rm -f vpasswd $(CXXLINK) $(vpasswd_LDFLAGS) $(vpasswd_OBJECTS) $(vpasswd_LDADD) $(LIBS) -vpasswd2db: $(vpasswd2db_OBJECTS) $(vpasswd2db_DEPENDENCIES) - @rm -f vpasswd2db - $(CXXLINK) $(vpasswd2db_LDFLAGS) $(vpasswd2db_OBJECTS) $(vpasswd2db_LDADD) $(LIBS) - vpasswds: $(vpasswds_OBJECTS) $(vpasswds_DEPENDENCIES) @rm -f vpasswds $(CXXLINK) $(vpasswds_LDFLAGS) $(vpasswds_OBJECTS) $(vpasswds_LDADD) $(LIBS) -vpopbull: $(vpopbull_OBJECTS) $(vpopbull_DEPENDENCIES) - @rm -f vpopbull - $(CXXLINK) $(vpopbull_LDFLAGS) $(vpopbull_OBJECTS) $(vpopbull_LDADD) $(LIBS) +vrehash: $(vrehash_OBJECTS) $(vrehash_DEPENDENCIES) + @rm -f vrehash + $(CXXLINK) $(vrehash_LDFLAGS) $(vrehash_OBJECTS) $(vrehash_LDADD) $(LIBS) vsetup: $(vsetup_OBJECTS) $(vsetup_DEPENDENCIES) @rm -f vsetup $(CXXLINK) $(vsetup_LDFLAGS) $(vsetup_OBJECTS) $(vsetup_LDADD) $(LIBS) +vupgrade: $(vupgrade_OBJECTS) $(vupgrade_DEPENDENCIES) + @rm -f vupgrade + $(CXXLINK) $(vupgrade_LDFLAGS) $(vupgrade_OBJECTS) $(vupgrade_LDADD) $(LIBS) + install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@ -444,11 +422,19 @@ fi; \ done $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook +dumpvuser.o: dumpvuser.cc ../config.h ../lib/config/configrc.h \ + ../lib/mystring/mystring.h ../lib/mystring/rep.h \ + ../lib/mystring/iter.h ../lib/mystring/join.h \ + ../lib/misc/strlist.h ../lib/vpwentry/vpwentry.h \ + ../lib/cli++/cli++.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \ + ../lib/fdbuf/fdobuf.h vcommand.h ../lib/vdomain/vdomain.h \ + ../lib/misc/pwentry.h ../lib/vpwtable/vpwtable.h \ + ../lib/misc/response.h listvdomain.o: listvdomain.cc ../config.h ../lib/config/configrc.h \ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ ../lib/misc/strlist.h ../lib/vpwentry/vpwentry.h \ - ../lib/cli/cli.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \ + ../lib/cli++/cli++.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \ ../lib/fdbuf/fdobuf.h vcommand.h ../lib/vdomain/vdomain.h \ ../lib/misc/pwentry.h ../lib/vpwtable/vpwtable.h \ ../lib/misc/response.h @@ -460,13 +446,13 @@ ../lib/misc/strlist.h ../lib/misc/pwcrypt.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ - ../lib/misc/response.h ../lib/cli/cli.h + ../lib/misc/response.h ../lib/cli++/cli++.h vaddusers.o: vaddusers.cc ../config.h ../lib/fdbuf/fdbuf.h \ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h \ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ ../lib/misc/pwcrypt.h ../lib/config/configrc.h \ - ../lib/misc/strlist.h ../lib/cli/cli.h vcommand.h \ + ../lib/misc/strlist.h ../lib/cli++/cli++.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ ../lib/misc/response.h @@ -475,14 +461,14 @@ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ ../lib/misc/passwdfn.h ../lib/config/configrc.h \ - ../lib/misc/strlist.h ../lib/cli/cli.h vcommand.h \ + ../lib/misc/strlist.h ../lib/cli++/cli++.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ ../lib/misc/response.h vcheckquota.o: vcheckquota.cc ../config.h ../lib/config/configrc.h \ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ - ../lib/misc/strlist.h ../lib/cli/cli.h ../lib/fdbuf/fdbuf.h \ + ../lib/misc/strlist.h ../lib/cli++/cli++.h ../lib/fdbuf/fdbuf.h \ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ @@ -493,10 +479,10 @@ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h \ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ - ../lib/config/configrc.h ../lib/misc/strlist.h ../lib/cli/cli.h \ - vcommand.h ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ - ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ - ../lib/misc/response.h + ../lib/config/configrc.h ../lib/misc/strlist.h \ + ../lib/cli++/cli++.h vcommand.h ../lib/vdomain/vdomain.h \ + ../lib/misc/pwentry.h ../lib/vpwtable/vpwtable.h \ + ../lib/vpwentry/vpwentry.h ../lib/misc/response.h vcommand.o: vcommand.cc ../config.h vcommand.h ../lib/vdomain/vdomain.h \ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ @@ -507,7 +493,7 @@ ../lib/fdbuf/fdobuf.h vdeliver.o: vdeliver.cc ../config.h ../lib/ac/time.h ../lib/ac/wait.h \ ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \ - ../lib/fdbuf/fdobuf.h ../lib/cli/cli.h vcommand.h \ + ../lib/fdbuf/fdobuf.h ../lib/cli++/cli++.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/mystring/mystring.h \ ../lib/mystring/rep.h ../lib/mystring/iter.h \ ../lib/mystring/join.h ../lib/config/configrc.h \ @@ -519,48 +505,32 @@ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h \ ../lib/config/configrc.h ../lib/mystring/mystring.h \ ../lib/mystring/rep.h ../lib/mystring/iter.h \ - ../lib/mystring/join.h ../lib/misc/strlist.h ../lib/cli/cli.h \ - vcommand.h ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ - ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ - ../lib/misc/response.h + ../lib/mystring/join.h ../lib/misc/strlist.h \ + ../lib/cli++/cli++.h vcommand.h ../lib/vdomain/vdomain.h \ + ../lib/misc/pwentry.h ../lib/vpwtable/vpwtable.h \ + ../lib/vpwentry/vpwentry.h ../lib/misc/response.h vpasswd.o: vpasswd.cc ../config.h ../lib/fdbuf/fdbuf.h \ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h \ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ ../lib/misc/passwdfn.h ../lib/config/configrc.h \ - ../lib/misc/strlist.h ../lib/cli/cli.h vcommand.h \ + ../lib/misc/strlist.h ../lib/cli++/cli++.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ ../lib/misc/response.h -vpasswd2cdb.o: vpasswd2cdb.cc ../config.h ../lib/cdb++/cdb++.h \ - ../lib/mystring/mystring.h ../lib/mystring/rep.h \ - ../lib/mystring/iter.h ../lib/mystring/join.h \ - ../lib/cdb++/datum.h ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \ - ../lib/fdbuf/fdobuf.h ../lib/cli/cli.h ../lib/config/configrc.h \ - ../lib/misc/strlist.h ../lib/vpwentry/vpwentry.h vcommand.h \ - ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ - ../lib/vpwtable/vpwtable.h ../lib/misc/response.h -vpasswd2db.o: vpasswd2db.cc ../config.h ../lib/cli/cli.h \ - ../lib/config/configrc.h ../lib/mystring/mystring.h \ - ../lib/mystring/rep.h ../lib/mystring/iter.h \ - ../lib/mystring/join.h ../lib/misc/strlist.h \ - ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \ - ../lib/fdbuf/fdobuf.h ../lib/vpwentry/vpwentry.h vcommand.h \ - ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ - ../lib/vpwtable/vpwtable.h ../lib/misc/response.h vpasswds.o: vpasswds.cc ../config.h ../lib/fdbuf/fdbuf.h \ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h \ ../lib/mystring/mystring.h ../lib/mystring/rep.h \ ../lib/mystring/iter.h ../lib/mystring/join.h \ ../lib/misc/response.h ../lib/config/configrc.h \ - ../lib/misc/strlist.h ../lib/cli/cli.h vcommand.h \ + ../lib/misc/strlist.h ../lib/cli++/cli++.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h vpopbull.o: vpopbull.cc ../config.h ../lib/ac/dirent.h ../lib/ac/time.h \ ../lib/misc/itoa.h ../lib/mystring/mystring.h \ ../lib/mystring/rep.h ../lib/mystring/iter.h \ ../lib/mystring/join.h ../lib/config/configrc.h \ - ../lib/misc/strlist.h ../lib/cli/cli.h ../lib/fdbuf/fdbuf.h \ + ../lib/misc/strlist.h ../lib/cli++/cli++.h ../lib/fdbuf/fdbuf.h \ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h vcommand.h \ ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ @@ -570,20 +540,29 @@ ../lib/fdbuf/fdobuf.h ../lib/mystring/mystring.h \ ../lib/mystring/rep.h ../lib/mystring/iter.h \ ../lib/mystring/join.h ../lib/misc/maildir.h \ - ../lib/config/configrc.h ../lib/misc/strlist.h \ - ../lib/vpwentry/vpwentry.h vcommand.h ../lib/vdomain/vdomain.h \ - ../lib/misc/pwentry.h ../lib/vpwtable/vpwtable.h \ - ../lib/misc/response.h ../lib/misc/stat_fns.h ../lib/cli/cli.h \ - ../lib/cdb++/cdb++.h ../lib/cdb++/datum.h + ../lib/config/configrc.h ../lib/misc/strlist.h vcommand.h \ + ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ + ../lib/vpwtable/vpwtable.h ../lib/vpwentry/vpwentry.h \ + ../lib/misc/response.h ../lib/misc/stat_fns.h \ + ../lib/cli++/cli++.h vsetup.o: vsetup.cc ../config.h ../lib/fdbuf/fdbuf.h \ ../lib/fdbuf/fdibuf.h ../lib/fdbuf/fdobuf.h \ ../lib/config/configrc.h ../lib/mystring/mystring.h \ ../lib/mystring/rep.h ../lib/mystring/iter.h \ ../lib/mystring/join.h ../lib/misc/strlist.h \ - ../lib/misc/stat_fns.h ../lib/cli/cli.h ../lib/misc/exec.h \ + ../lib/misc/stat_fns.h ../lib/cli++/cli++.h ../lib/misc/exec.h \ ../lib/vpwentry/vpwentry.h vcommand.h ../lib/vdomain/vdomain.h \ ../lib/misc/pwentry.h ../lib/vpwtable/vpwtable.h \ ../lib/misc/response.h +vupgrade.o: vupgrade.cc ../config.h ../lib/cli++/cli++.h \ + ../lib/config/configrc.h ../lib/mystring/mystring.h \ + ../lib/mystring/rep.h ../lib/mystring/iter.h \ + ../lib/mystring/join.h ../lib/misc/strlist.h \ + ../lib/fdbuf/fdbuf.h ../lib/fdbuf/fdibuf.h \ + ../lib/fdbuf/fdobuf.h ../lib/vpwentry/vpwentry.h vcommand.h \ + ../lib/vdomain/vdomain.h ../lib/misc/pwentry.h \ + ../lib/vpwtable/vpwtable.h ../lib/misc/response.h \ + ../lib/misc/maildir.h info-am: info: info-am @@ -607,7 +586,7 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(mandir)/man1 @@ -666,8 +645,8 @@ dist-hook: touch $(distdir)/*.html $(distdir)/*.[123456789] -%.pod: %.cc ../configure.in ../lib/cli/cli2pod.pl - perl ../lib/cli/cli2pod.pl $< >$@ +%.pod: %.cc ../configure.in ../lib/cli++/cli++topod.pl + perl ../lib/cli++/cli++topod.pl $< >$@ %.1: %.pod ../configure.in; $(POD2MAN) --section=1 $< >$@ %.html: %.pod; $(POD2HTML) $< >$@