From aeb1829220e6371977072d8d00029881bdbc9f83 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 7 Mar 2008 17:47:44 +0000 Subject: [PATCH] Fri Mar 7 11:49:17 EST 2008 Pekka.Pessi@nokia.com * tests/Makefile: using testsdir, installing check_sofia there git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7826 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/tests/Makefile.am | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libs/sofia-sip/tests/Makefile.am b/libs/sofia-sip/tests/Makefile.am index d305a66e5a..6562301701 100644 --- a/libs/sofia-sip/tests/Makefile.am +++ b/libs/sofia-sip/tests/Makefile.am @@ -5,7 +5,8 @@ EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c TESTS = -check_PROGRAMS = +tests_PROGRAMS = +testsdir := ${libdir}/tests/libsofia-sip-ua-tests include $(top_srcdir)/rules/sofia.am @@ -14,20 +15,21 @@ INCLUDES = ${INTERNAL_INCLUDES} AM_CFLAGS += @CHECK_CFLAGS@ if HAVE_CHECK + TESTS += check_sofia -check_PROGRAMS += check_sofia +tests_PROGRAMS += check_sofia check_sofia_SOURCES = check_sofia.c check_sofia.h \ suite_for_nua.c -${sofiabuilddir}/nua/libtestnua.la \ +CHECKLIBS = ${sofiabuilddir}/nua/libtestnua.la \ ${sofiabuilddir}/nua/libtestproxy.la \ - ${sofiabuilddir}/nua/libtestnat.la: + ${sofiabuilddir}/nua/libtestnat.la + +$(CHECKLIBS): cd ${sofiabuilddir}/nua && make checklib check_sofia_LDADD = \ - ${sofiabuilddir}/nua/libtestnua.la \ - ${sofiabuilddir}/nua/libtestproxy.la \ - ${sofiabuilddir}/nua/libtestnat.la \ - ${sofiabuilddir}/libsofia-sip-ua.la @CHECK_LIBS@ + $(CHECKLIBS) ${sofiabuilddir}/libsofia-sip-ua.la \ + @CHECK_LIBS@ endif