Use autoconf to locate the diff and patch executables and pass those pathnames to...

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index d74de398e0a3387c300468c295104673b3a66f7e..44de522c3f9c3947a2c70543c2a5bbcae2335735 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -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,10 +65,14 @@ 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 \
        utils/setup.c utils/msgform.c utils/chkpw.c \
@@ -86,7 +89,7 @@ SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
        locate_host.c md5.c auth.c msgbase.c parsedate.c \
        room_ops.c euidindex.c server_main.c snprintf.c ldap.c \
        support.c sysdep.c user_ops.c journaling.c threads.c \
-       context.c event_client.c
+       context.c
 
 
 include Make_sources
@@ -147,7 +150,7 @@ Make_modules: modules_init.c
 
 modules_upgrade.c: modules_init.c
 
-SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \
+SERV_OBJS = server_main.o utillib/citadel_dirs.o\
        user_ops.o citserver.o sysdep.o serv_extensions.o \
        $(DATABASE:.c=.o) domain.o \
        control.o config.o support.o room_ops.o \
@@ -155,13 +158,14 @@ 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