Rework the aidepost utility to not need the config file

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index e19ce4007547260dc6471e770da17cedee94d292..21b39511283ecf7090032d05ec58c79a7633f0af 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -24,7 +24,7 @@ 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
 
@@ -47,14 +47,13 @@ UTILBIN_TARGETS= base64$(EXEEXT) setup$(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,6 +65,8 @@ SERVER_LDFLAGS=@SERVER_LDFLAGS@
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
+DIFF=@DIFF@
+PATCH=@PATCH@
 LOCALEDIR=@LOCALEDIR@
 
 # End configuration section
@@ -157,7 +158,7 @@ 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)
@@ -167,8 +168,8 @@ citserver$(EXEEXT): $(SERV_OBJS)
        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
@@ -203,10 +204,8 @@ stress$(EXEEXT): 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 $(LIBOBJS)
+       $(CC) utils/sendcommand.o \
                $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
 getmail$(EXEEXT): utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \
@@ -450,4 +449,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)