--- a/lib/Makefile.am	Sun Jan 20 00:12:17 2008 +0100
+++ b/lib/Makefile.am	Sun Jan 20 00:22:09 2008 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli fdbuf mystring config \
+SUBDIRS = misc vdomain vpwentry vpwtable cdb++ cgi cli++ fdbuf mystring config \
 	courier-authlib
 noinst_LIBRARIES = libvmailmgr.a libcgi.a libcli.a
 EXTRA_DIST = mergelib.sh
@@ -13,9 +13,9 @@
 	vdomain/libvdomain.a fdbuf/libfdbuf.a mystring/libmystring.a
 	
 libcli_a_SOURCES =
-libcli.a: cli/libcli.a mergelib.sh
+libcli.a: cli++/libcli++.a mergelib.sh
 	$(RM) -f $@
-	sh mergelib.sh $@ cli/libcli.a
+	sh mergelib.sh $@ cli++/libcli++.a
 
 libcgi_a_SOURCES =
 libcgi.a: cgi/libcgi.a mergelib.sh