projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Logging: add timestamps for eventdriven IO
[citadel.git] / citadel / Makefile.in
diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index d74de398e0a3387c300468c295104673b3a66f7e..060f8df64c46003fc69eb0fab186ad4d33ecddd8 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -24,13 +24,13 @@ HELP_DIR=@MAKE_HELP_DIR@
 DOC_DIR=@MAKE_DOC_DIR@
 UTILBIN_DIR=@MAKE_UTILBIN_DIR@
 DEPEND_FLAG=@DEPEND_FLAG@
-all: $(TARGETS)
+all: buildinfo $(TARGETS)
 
 .SUFFIXES: .o .d .c
 
 EXEEXT=@EXEEXT@
 
-CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) 
+CLIENT_TARGETS=citadel$(EXEEXT)
 NOINST_TARGETS=stress$(EXEEXT)
 SERVER_TARGETS=citserver$(EXEEXT)
 SERV_MODULES= md5.o \
@@ -41,20 +41,19 @@ include Make_modules
 UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
 UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
-       chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \
-       getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \
+       chkpw$(EXEEXT) chkpwd$(EXEEXT) \
+       aidepost$(EXEEXT) msgform$(EXEEXT) \
        ctdlmigrate$(EXEEXT)
 
 
 ACLOCAL=@ACLOCAL@
-AUTH=@AUTH@
 AUTOCONF=@AUTOCONF@
 chkpwd_LIBS=@chkpwd_LIBS@
 CC=@CC@
 CFLAGS=@CFLAGS@ -I ./include/
 CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
-DEFS=@DEFS@
+DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\"
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
@@ -66,14 +65,18 @@ SERVER_LDFLAGS=@SERVER_LDFLAGS@
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
+DIFF=@DIFF@
+PATCH=@PATCH@
 LOCALEDIR=@LOCALEDIR@
 
 # End configuration section
 
+.SILENT:
 
-SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
+
+SOURCES=utils/aidepost.c utils/stress.c utils/citmail.c \
        utils/setup.c utils/msgform.c utils/chkpw.c \
-       utils/sendcommand.c utils/getmail.c utils/userlist.c \
+       utils/sendcommand.c \
        utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \
        utillib/citadel_ipc.c utillib/citadel_dirs.c utillib/ipc_c_tcp.c \
        textclient/client_chat.c textclient/client_passwords.c \
@@ -155,17 +158,18 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \
        locate_host.o housekeeping.o \
        internet_addressing.o journaling.o \
        parsedate.o genstamp.o ecrash.o threads.o context.o \
-       clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \
+       clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
        svn_revision.o ldap.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
        $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
 
-.c.o:
+%.o: %.c ${HEADERS}
+       echo "CC $<"
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-aidepost$(EXEEXT): utils/aidepost.o config.o
-       $(CC) utils/aidepost.o config.o utillib/citadel_dirs.o \
+aidepost$(EXEEXT): utils/aidepost.o utillib/citadel_dirs.o
+       $(CC) utils/aidepost.o utillib/citadel_dirs.o \
                $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS)
 
 citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o
@@ -188,39 +192,19 @@ chkpw$(EXEEXT): utils/chkpw.o auth.o utillib/citadel_dirs.o
        $(CC) utils/chkpw.o auth.o utillib/citadel_dirs.o \
                $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
-whobbs$(EXEEXT): utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-               utillib/citadel_dirs.o $(LIBOBJS)
-       $(CC) utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-               utillib/citadel_dirs.o $(LIBOBJS) \
-               $(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS)
-
 stress$(EXEEXT): utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
                utillib/citadel_dirs.o $(LIBOBJS)
        $(CC) utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
                utillib/citadel_dirs.o $(LIBOBJS) \
                $(LDFLAGS) -o stress$(EXEEXT) $(LIBS)
 
-sendcommand$(EXEEXT): utils/sendcommand.o utillib/ipc_c_tcp.o \
-               utillib/citadel_ipc.o config.o  $(LIBOBJS)
-       $(CC) utils/sendcommand.o utillib/ipc_c_tcp.o \
-               utillib/citadel_ipc.o config.o utillib/citadel_dirs.o \
+sendcommand$(EXEEXT): utils/sendcommand.o utillib/citadel_dirs.o $(LIBOBJS)
+       $(CC) utils/sendcommand.o utillib/citadel_dirs.o \
                $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
-getmail$(EXEEXT): utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-               config.o  $(LIBOBJS)
-       $(CC) utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-               config.o utillib/citadel_dirs.o \
-               $(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS)
-
 base64$(EXEEXT): utils/base64.o
        $(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT)
 
-userlist$(EXEEXT): utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-               utillib/citadel_dirs.o $(LIBOBJS)
-       $(CC) utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
-               utillib/citadel_dirs.o \
-               $(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS)
-
 msgform$(EXEEXT): utils/msgform.o
        $(CC) utils/msgform.o $(LDFLAGS) -o msgform$(EXEEXT)
 
@@ -299,7 +283,7 @@ install-data-new:
                echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
                $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \
        fi
-       @for i in bio bitbucket files images info userpics; do \
+       @for i in bio bitbucket files images info userpics netconfigs; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \
        done
 
@@ -339,7 +323,7 @@ install-doc-new:
        $(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt
 
 install-exec: all
-       @for i in bio bitbucket files images info userpics; do \
+       @for i in bio bitbucket files images info userpics netconfigs; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
        @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
@@ -447,4 +431,11 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
+buildinfo:
+       echo
+       echo "Dependencies: $(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@"
+       echo "Complie: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
+       echo "LDFLAGS: $(LDFLAGS)"
+       echo
+
 -include $(DEP_FILES)
Citadel server, clients, utilities