X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=44de522c3f9c3947a2c70543c2a5bbcae2335735;hb=1428026a3d58abcf316a7f9aacdf110cc78add85;hp=f1c8736740f187eb74a9bfa50ee57f4a180a94c6;hpb=ae60aa1708e79de5ad979c427d06f431ee1f6d0d;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index f1c873674..44de522c3 100644
--- 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 \
@@ -155,13 +158,14 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.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
@@ -227,7 +231,7 @@ msgform$(EXEEXT): utils/msgform.o
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
 install-locale:
-	cd po; $(MAKE)
+	cd po/citadel-setup; $(MAKE)
 	for i in `find locale -type d | grep -v .svn` \
 		; do \
 		test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \