Tue Jan 13 10:10:10 CST 2009 Pekka Pessi <first.last@nokia.com>

  * rules/silent.am: silence. at last.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11815 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/Makefile.am b/libs/sofia-sip/Makefile.am
index 84fe9528a4dc5329ed34bc3f4a2e64add320e045..46415ef5a5d5cb08bd023fdefd179d476931cd39 100644 (file)
--- a/libs/sofia-sip/Makefile.am
+++ b/libs/sofia-sip/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

diff --git a/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am b/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am
index b2a6f5b9afc4181bdba9c0978119399639c6ddba..d491475a458d7ced83c0536b7341ca065a6c0c00 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am
+++ b/libs/sofia-sip/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

diff --git a/libs/sofia-sip/libsofia-sip-ua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/Makefile.am
index dbf4a66b226009e317693dbba0fa3c90d4f30eec..78a83073928ae287f2f52d203f1842057f6b727e 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/Makefile.am
+++ b/libs/sofia-sip/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)

diff --git a/libs/sofia-sip/rules/sofia.am b/libs/sofia-sip/rules/sofia.am
index 328b53b61f97adccb1f0ef8527dc1b626435d902..3d3b88f50f502e2fffddfcb8d4a41bc4149db945 100644 (file)
--- a/libs/sofia-sip/rules/sofia.am
+++ b/libs/sofia-sip/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