rules/silent.am: silence. at last.

darcs-hash:20090113161010-db55f-537e0b52450189128a7c4b7d0f4b4ae9806f2af4.gz

Makefile.am

@@ -7,8 +7,8 @@
 
 AUTOMAKE_OPTIONS = foreign 1.7
 
-SUBDIRS = libsofia-sip-ua $(GLIB_SUBDIRS) utils packages tests
-DIST_SUBDIRS = libsofia-sip-ua libsofia-sip-ua-glib utils packages \
+SUBDIRS = s2check libsofia-sip-ua $(GLIB_SUBDIRS) utils packages tests
+DIST_SUBDIRS = s2check libsofia-sip-ua libsofia-sip-ua-glib utils packages \
 	tests win32 open_c
 
 # note: when glib devel files are not available, make should not
@@ -66,6 +66,9 @@ built-sources clean-built-sources valcheck doxygen:
 
 PHONY = built-sources clean-built-sources valcheck doxygen manpages
 
+# s2check depends on generated headers within libsofia-sip-ua
+all check: built-sources
+
 if HAVE_LCOV
 
 include $(top_srcdir)/rules/lcov.am

libsofia-sip-ua-glib/Makefile.am

@@ -50,6 +50,8 @@ if HAVE_LCOV
 include $(top_srcdir)/rules/lcov.am
 endif
 
+include $(top_srcdir)/rules/silent.am
+
 .PHONY = $(PHONY)
 
 CLEANFILES = docs/*.doxytags

libsofia-sip-ua/Makefile.am

@@ -107,4 +107,6 @@ if HAVE_LCOV
 include $(top_srcdir)/rules/lcov.am
 endif
 
+include $(top_srcdir)/rules/silent.am
+
 .PHONY: $(PHONY)

rules/silent.am

+# Silent compilation w/ Automake 1.9 or 1.10
+# ----------------------------------------------------------
+
+# Automake 1.9.6 is not clever enough to override suffix rules within if
+# if SOFIA_COMPILE_SILENT
+
+SOFIA_SILENT=@
+
+LIBTOOL_FLAGS = --silent
+
+# From Automake 1.9.6 - 
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(LIBTOOL_FLAGS) \
+	$(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+
+LINK = 	${SOFIA_SILENT}test ${SOFIA_SILENT} != @ || echo '	 LINK $@'; \
+	$(LIBTOOL) --tag=CC --mode=link $(LIBTOOL_FLAGS) \
+	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+# Rules from depend2.am (GENERIC = TRUE, SUBDIROBJ = FALSE, %FASTDEP% = am_fastdepCC) silenced. 
+.c.o:
+	@test ${SOFIA_SILENT} != @ || echo '	 COMPILE $@'
+if am__fastdepCC
+	${SOFIA_SILENT}if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+else
+if AMDEP
+	${SOFIA_SILENT}source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+	${SOFIA_SILENT}DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+	${SOFIA_SILENT}$(COMPILE) -c -o $@ $<
+endif
+
+.c.lo:
+	@test ${SOFIA_SILENT} != @ || echo '	 LTCOMPILE $@'
+if am__fastdepCC
+	${SOFIA_SILENT}if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+else
+if AMDEP
+	${SOFIA_SILENT}source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+	${SOFIA_SILENT}DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif
+	${SOFIA_SILENT}$(LTCOMPILE) -c -o $@ $<
+endif
+
+# endif

rules/sofia.am

@@ -68,3 +68,5 @@ include $(top_srcdir)/rules/valcheck.am
 if HAVE_LCOV
 include $(top_srcdir)/rules/lcov.am
 endif
+
+include $(top_srcdir)/rules/silent.am