more conflicts from r8400

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

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
index 65d822968c2957f7c897c9177eb04d46cf258fd6..145150b8d9959c832308cbf9f4edeade1644e09e 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am
@@ -66,44 +66,6 @@ nua_libs =           libnua.la  \
                        ../bnf/libbnf.la \
                        ../su/libsu.la
 
-test_nua_LDFLAGS =     -static
-
-libtestnua_la_SOURCES = test_nua.h test_ops.c \
-                       test_init.c \
-                       test_nua_api.c test_nua_params.c \
-                       test_register.c test_basic_call.c \
-                       test_offer_answer.c \
-                       test_call_reject.c test_cancel_bye.c \
-                       test_call_hold.c test_session_timer.c \
-                       test_refer.c test_100rel.c \
-                       test_sip_events.c test_simple.c \
-                       test_extension.c
-
-
-libtestproxy_la_SOURCES = test_proxy.h test_proxy.c
-
-libtestnat_la_SOURCES = test_nat.h test_nat.c test_nat_tags.c
-
-test_nua_SOURCES =     test_nua.c 
-
-test_nua_LDADD =       libnua.la libtestnua.la libtestproxy.la libtestnat.la \
-                       ../iptsec/libiptsec.la \
-                       ../ipt/libipt.la \
-                       ../nea/libnea.la \
-                       ../nta/libnta.la \
-                       ../sresolv/libsresolv.la \
-                       ../tport/libtport.la \
-                       ../stun/libstun.la \
-                       ../soa/libsoa.la \
-                       ../sdp/libsdp.la \
-                       ../sip/libsip.la \
-                       ../http/libhttp.la \
-                       ../msg/libmsg.la \
-                       ../url/liburl.la \
-                       ../bnf/libbnf.la \
-                       ../su/libsu.la
-
-^ ^ ^ ^ ^ ^ ^
 # ----------------------------------------------------------------------
 # Install and distribution rules