Where gettimeofday() is required, include both time.h and sys/time.h

[citadel.git] / citadel / Makefile

diff --git a/citadel/Makefile b/citadel/Makefile
index 2a3193224a6cc47d158ee2f29e577aa6ad05c361..21c758592af2c68e55e39ad7300954823a1fdae5 100644 (file)
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -10,7 +10,7 @@
 # config.mk is generated by ./configure
 include config.mk
 
-all := dbnothing ctdldump ctdlload citserver setup sendcommand citmail chkpw chkpwd loadtest
+all := ctdldump ctdlload citserver setup sendcommand citmail loadtest dbnothing ${CHKPW}
 all: $(all)
 
 SERVER_SOURCES := $(wildcard server/*.c server/modules/*/*.c)
@@ -32,11 +32,11 @@ citserver: $(SERVER_OBJECTS) $(BACKEND_OBJECTS)
        ${CC} ${CFLAGS} \
                $(SERVER_OBJECTS) $(BACKEND_OBJECTS) \
                ${LDFLAGS} \
-               -lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${BACKEND_LDFLAGS} \
+               -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl ${LRESOLV} ${BACKEND_LDFLAGS} \
                -o citserver
 
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h
-       ${CC} ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel -o setup
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/setup.c -lcitadel ${LINTL} -o setup
 
 ctdlmigrate: utils/ctdlmigrate.c server/citadel_dirs.c utils/*.h server/*.h
        ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlmigrate.c -lcitadel -lreadline -o ctdlmigrate
@@ -44,9 +44,6 @@ ctdlmigrate: utils/ctdlmigrate.c server/citadel_dirs.c utils/*.h server/*.h
 sendcommand: utils/sendcommand.c server/citadel_dirs.c utils/*.h server/*.h
        ${CC} ${CFLAGS} ${LDFLAGS} utils/sendcommand.c -lcitadel -o sendcommand
 
-loadtest: utils/loadtest.c server/citadel_dirs.c utils/*.h server/*.h
-       ${CC} ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -o loadtest
-
 citmail: utils/citmail.c server/citadel_dirs.c utils/*.h server/*.h
        ${CC} ${CFLAGS} ${LDFLAGS} utils/citmail.c -lcitadel -o citmail
 
@@ -65,6 +62,9 @@ ctdldump: utils/ctdldump.c utils/*.h server/*.h ${BACKEND_OBJECTS}
 ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h ${BACKEND_OBJECTS}
        ${CC} ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c ${BACKEND_OBJECTS} -lcitadel -lz ${BACKEND_LDFLAGS} -lpthread -o ctdlload
 
+loadtest: utils/loadtest.c server/citadel_dirs.c utils/*.h server/*.h
+       ${CC} ${CFLAGS} ${LDFLAGS} utils/loadtest.c -lcitadel -lpthread -o loadtest
+
 config.mk: configure
        ./configure