Author: mikej Date: Fri Mar 7 12:38:16 2008 New Revision: 7812 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am freeswitch/trunk/libs/sofia-sip/rules/recursive.am freeswitch/trunk/libs/sofia-sip/rules/sofia.am freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Log: 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. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am Fri Mar 7 12:38:16 2008 @@ -64,6 +64,8 @@ include $(top_srcdir)/rules/recursive.am +checklib: checklib-recursive $(lib_LTLIBRARIES) + doxygen: built-sources @echo Generating empty doxytags mkdir -p docs/html ; \ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am Fri Mar 7 12:38:16 2008 @@ -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 Modified: freeswitch/trunk/libs/sofia-sip/rules/recursive.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/rules/recursive.am (original) +++ freeswitch/trunk/libs/sofia-sip/rules/recursive.am Fri Mar 7 12:38:16 2008 @@ -7,7 +7,8 @@ valcheck: valcheck-recursive SOFIA_RECURSIVE = \ - valcheck-recursive + valcheck-recursive \ + checklib-recursive SOFIA_DIST_RECURSIVE = \ built-sources-recursive \ Modified: freeswitch/trunk/libs/sofia-sip/rules/sofia.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/rules/sofia.am (original) +++ freeswitch/trunk/libs/sofia-sip/rules/sofia.am Fri Mar 7 12:38:16 2008 @@ -38,6 +38,8 @@ ../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 \ Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Fri Mar 7 12:38:16 2008 @@ -20,6 +20,11 @@ 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 \