--- a/commands/Makefile.am	Sun Jan 20 00:12:17 2008 +0100
+++ b/commands/Makefile.am	Sun Jan 20 00:22:09 2008 +0100
@@ -1,23 +1,20 @@
-bin_PROGRAMS = @CDBPROGS@ \
-	listvdomain vadduser vaddusers vchattr vchforwards vcheckquota \
-	vdeliver vdeluser vpasswd vpasswd2db vpasswds vpopbull vsetup
-bin_SCRIPTS = @CDBSCRIPTS@ vaddalias vconf2dir
+bin_PROGRAMS = dumpvuser listvdomain vadduser vaddusers vchattr vchforwards \
+	vdeliver vdeluser vpasswd vpasswds vrehash vsetup vupgrade
+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_PROGRAMS = vpasswd2cdb vrehash
-EXTRA_SCRIPTS = allvpasswd2cdb
+EXTRA_SCRIPTS = vupgrade-all
 
 all: docs
 
@@ -26,14 +23,16 @@
 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) $< >$@
 
-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
 
@@ -46,9 +45,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
 
@@ -64,21 +60,11 @@
 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
 
-if VPWTABLE_CDB
-
-vpasswd2cdb_SOURCES = vpasswd2cdb.cc vcommand.cc
-vpasswd2cdb_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a
-
 vrehash_SOURCES = vrehash.cc vcommand.cc
 vrehash_LDADD = ../lib/libcli.a ../lib/libvmailmgr.a
-
-endif