--- a/daemon/Makefile.am	Sun Jan 20 00:12:17 2008 +0100
+++ b/daemon/Makefile.am	Sun Jan 20 00:22:09 2008 +0100
@@ -15,16 +15,15 @@
 dist-hook:
 	touch $(distdir)/*.html $(distdir)/*.[123456789]
 
-vmailmgrd.pod: main.cc ../configure.in ../lib/cli/cli2pod.pl
-	perl ../lib/cli/cli2pod.pl $< >$@
+vmailmgrd.pod: main.cc ../configure.in ../lib/cli++/cli++topod.pl
+	perl ../lib/cli++/cli++topod.pl $< >$@
 %.8: %.pod ../configure.in; $(POD2MAN) --section=8 $< >$@
 %.html: %.pod; $(POD2HTML) $< >$@
 
-CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
 INCLUDES = -I../lib
 
 vmailmgrd_SOURCES = daemon.h \
-	adduser2.cc \
+	adduser.cc \
 	autoresponse.cc \
 	chattr.cc \
 	check.cc \
@@ -35,5 +34,6 @@
 	log.h log.cc \
 	lookup.cc \
 	main.cc \
+	stat.cc \
 	state.h state.cc
-vmailmgrd_LDADD = ../lib/libvmailmgr.a ../lib/cli/libcli.a
+vmailmgrd_LDADD = ../lib/libvmailmgr.a ../lib/cli++/libcli++.a