X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2FMakefile.in;h=fe9ea8d1bd862331ed64af2c3de88c8c5f77593d;hb=79c2898dd47f505daa49a2a1ca84b94761391c3e;hp=bfd7e378f963a8daf3eea89239104210233f18be;hpb=3d1fe95321f318ae8882fcfde1ac63f0954c91fa;p=citadel.git

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index bfd7e378f..fe9ea8d1b 100644
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -18,6 +18,7 @@ PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
 LOCALEDIR=@LOCALEDIR@
 WWWDIR=@WWWDIR@
+HEADERS=calendar.h  groupdav.h  messages.h  modules_init.h  paramhandling.h  preferences.h  roomops.h  subst.h  sysdep.h  tcp_sockets.h  utils.h  webcit.h  webserver.h
 
 # End of configuration section
 
@@ -27,6 +28,7 @@ all: all-progs-recursive webcit setup
 mkdir-init:
 	mkdir locale
 
+.SILENT:
 
 .SUFFIXES: .cpp .c .o
 
@@ -36,7 +38,7 @@ clean:
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
-		po/Makefile \
+		po/webcit/Makefile \
 		$(srcdir)/TAGS
 
 setup: setup.o gettext.o
@@ -47,7 +49,7 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
 	cookie_conversion.o locate_host.o summary.o \
 	webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o marchlist.o \
 	roomops.o roomlist.o roomtokens.o roomviews.o blogview_renderer.o \
-	messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
+	messages.o msg_renderers.o paging.o sysmsgs.o \
 	useredit.o vcard_edit.o preferences.o html2html.o listsub.o roomchat.o \
 	graphics.o netconf.o siteconfig.o subst.o bbsview_renderer.o \
 	calendar.o calendar_tools.o calendar_view.o tasks.o event.o smtpqueue.o \
@@ -63,7 +65,7 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
 	webserver.o context_loop.o cookie_conversion.o marchlist.o \
 	webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o listsub.o \
 	roomops.o roomlist.o roomtokens.o roomviews.o blogview_renderer.o \
-	messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
+	messages.o msg_renderers.o paging.o sysmsgs.o \
 	useredit.o locate_host.o siteconfig.o subst.o vcard_edit.o roomchat.o \
 	graphics.o netconf.o preferences.o html2html.o openid.o bbsview_renderer.o \
 	summary.o calendar.o calendar_tools.o calendar_view.o tasks.o event.o wiki.o \
@@ -75,11 +77,13 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
 	paramhandling.o utils.o ical_maps.o ical_subst.o static.o feed_generator.o \
 	$(LIBS)
 
-.c.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
+%.o: %.c ${HEADERS}
+	echo "CC $<"
+	$(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@ $<
 
-.cpp.o:
-	$(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
+%.o: %.cpp ${HEADERS}
+	echo "CC+ $<"
+	$(CC) $(CFLAGS) $(DEFS) $(PTHREAD_DEFS) -c -o $@ $<
 
 Makefile: $(srcdir)/Makefile.in config.status
 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@@ -132,7 +136,7 @@ install-tinymce:
 	done
 
 install-locale:
-	cd po; $(MAKE)
+	cd po/webcit/; $(MAKE)
 	for i in `find locale -type d | grep -v .svn` \
 		; do \
 		test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \