From a7be7d7156e558530db947bd028f3971c4cfff4a Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 7 Mar 2008 17:38:16 +0000 Subject: [PATCH] Thu Mar 6 12:43:23 EST 2008 Pekka.Pessi@nokia.com * rules.am, sofia.am various Makefile.ams: added checklib target make all now builds only the library, not the (nua) test libraries. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7812 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/libsofia-sip-ua/Makefile.am | 2 ++ libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am | 4 +++- libs/sofia-sip/rules/recursive.am | 3 ++- libs/sofia-sip/rules/sofia.am | 2 ++ libs/sofia-sip/tests/Makefile.am | 5 +++++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/sofia-sip/libsofia-sip-ua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/Makefile.am index 4238f911aa..2b181af67e 100644 --- a/libs/sofia-sip/libsofia-sip-ua/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/Makefile.am @@ -64,6 +64,8 @@ PHONY = doxygen built-sources include $(top_srcdir)/rules/recursive.am +checklib: checklib-recursive $(lib_LTLIBRARIES) + doxygen: built-sources @echo Generating empty doxytags mkdir -p docs/html ; \ diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am index ab20e470d1..366c5ecc2b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am @@ -11,7 +11,9 @@ # ---------------------------------------------------------------------- # Build targets -noinst_LTLIBRARIES = libnua.la libtestnua.la libtestproxy.la libtestnat.la +noinst_LTLIBRARIES = libnua.la + +check_LTLIBRARIES = libtestnua.la libtestproxy.la libtestnat.la check_PROGRAMS = test_nua diff --git a/libs/sofia-sip/rules/recursive.am b/libs/sofia-sip/rules/recursive.am index a801f75937..b277d6de43 100644 --- a/libs/sofia-sip/rules/recursive.am +++ b/libs/sofia-sip/rules/recursive.am @@ -7,7 +7,8 @@ clean-built-sources: clean-built-sources-recursive valcheck: valcheck-recursive SOFIA_RECURSIVE = \ - valcheck-recursive + valcheck-recursive \ + checklib-recursive SOFIA_DIST_RECURSIVE = \ built-sources-recursive \ diff --git a/libs/sofia-sip/rules/sofia.am b/libs/sofia-sip/rules/sofia.am index b9061ba93c..328b53b61f 100644 --- a/libs/sofia-sip/rules/sofia.am +++ b/libs/sofia-sip/rules/sofia.am @@ -38,6 +38,8 @@ _tag.c_tag_ref.c: ../tport/libtport.la ../url/liburl.la: cd $(@D) && $(MAKE) $(@F) +checklib: $(noinst_LTLIBRARIES) $(check_LTLIBRARIES) + INTERNAL_INCLUDES = \ -I${sofiasrcdir}/features -I${sofiabuilddir}/features \ -I${sofiasrcdir}/ipt -I${sofiabuilddir}/ipt \ diff --git a/libs/sofia-sip/tests/Makefile.am b/libs/sofia-sip/tests/Makefile.am index ac1cf3adfb..d305a66e5a 100644 --- a/libs/sofia-sip/tests/Makefile.am +++ b/libs/sofia-sip/tests/Makefile.am @@ -20,6 +20,11 @@ check_PROGRAMS += check_sofia check_sofia_SOURCES = check_sofia.c check_sofia.h \ suite_for_nua.c +${sofiabuilddir}/nua/libtestnua.la \ + ${sofiabuilddir}/nua/libtestproxy.la \ + ${sofiabuilddir}/nua/libtestnat.la: + cd ${sofiabuilddir}/nua && make checklib + check_sofia_LDADD = \ ${sofiabuilddir}/nua/libtestnua.la \ ${sofiabuilddir}/nua/libtestproxy.la \