From 1c7e5db568a4a343a86e2e14ccf85e6fc6e94af0 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 4 Aug 2011 20:08:30 +0000 Subject: [PATCH] add .silent and some echo logic to our makefiles; thanks to sECuRE for the hints. --- citadel/Makefile.in | 5 ++++- webcit/Makefile.in | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index d74de398e..e19ce4007 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -70,6 +70,8 @@ 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 \ @@ -161,7 +163,8 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.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 diff --git a/webcit/Makefile.in b/webcit/Makefile.in index 9b2c6a630..6a06a785b 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 @@ -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 -- 2.30.2