Release version 983 generated by do-release.sh

[citadel.git] / citadel / Makefile

diff --git a/citadel/Makefile b/citadel/Makefile
index 9f260add0cd6a951f3181c4465b258b20513fa5e..836362f43ff9c390bea2c08269cd4c9d6147c324 100644 (file)
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -5,12 +5,12 @@
 # well on the Linux operating system (which uses the Linux kernel) and on BSD.
 #
 # This program is open source software.  Use, duplication, and/or
-# disclosure are subject to the GNU General Purpose License version 3.
+# disclosure are subject to the GNU General Public License version 3.
 
 # config.mk is generated by ./configure
 include config.mk
 
-all := citserver setup ctdlmigrate sendcommand citmail chkpw chkpwd
+all := citserver setup sendcommand citmail chkpw chkpwd
 all: $(all)
 
 SRCDIRS := $(wildcard server server/modules/*)
@@ -25,10 +25,11 @@ citserver: $(OBJECTS)
                -o citserver
 
 $(SOURCES): server/*.h server/modules/*/*.h
-       touch $@
+       @touch $@
 
 %.o: %.c
-       cc ${CFLAGS} -c $< -o $@
+       @echo $<
+       @cc ${CFLAGS} -c $< -o $@
 
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h
        cc ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel -o setup
@@ -48,11 +49,11 @@ chkpw: utils/chkpw.c utils/*.h server/*.h
 chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h
        cc ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd
 
-ctdl3264: utils/ctdl3264.c utils/*.h server/*.h utils/ctdl3264_structs.h
-       cc ${CFLAGS} ${LDFLAGS} utils/ctdl3264.c -lcitadel -lz -ldb -o ctdl3264
+ctdldump: utils/ctdldump.c utils/*.h server/*.h
+       cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c -lcitadel -lz -ldb -lpthread -o ctdldump
 
-utils/ctdl3264_structs.h: server/server.h utils/ctdl3264_prep.sh
-       utils/ctdl3264_prep.sh
+ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h
+       cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c -lcitadel -lz -ldb -lpthread -o ctdlload
 
 config.mk: configure
        ./configure
@@ -65,9 +66,7 @@ distclean: clean
        rm -vf config.mk
 
 install: $(all) utils/*.sh
-       #
-       # Installing to ${CTDLDIR}
-       #
+       @echo Installing to ${CTDLDIR}
        @for x in $(all) utils/*.sh ; do \
                install -v -C -D -t ${CTDLDIR} $$x ;\
        done