Author: anthm Date: Thu May 10 17:42:16 2007 New Revision: 5139 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Log: make sofia-sip a conv. lib so we get their libs when we link 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 Thu May 10 17:42:16 2007 @@ -30,7 +30,7 @@ DOXYGEN = doxygen -lib_LTLIBRARIES = libsofia-sip-ua.la +noinst_LTLIBRARIES = libsofia-sip-ua.la libsofia_sip_ua_la_SOURCES = libsofia_sip_ua_la_LIBADD = bnf/libbnf.la \ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile.am Thu May 10 17:42:16 2007 @@ -12,9 +12,7 @@ MODNAME=mod_sofia -BASE=../../../.. - -SOFIA_DIR=$(BASE)/libs/sofia-sip +SOFIA_DIR=$(switch_builddir)/libs/sofia-sip SOFIAUA_DIR=$(SOFIA_DIR)/libsofia-sip-ua SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la @@ -31,7 +29,7 @@ mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/stun -I$(SOFIAUA_DIR)/su mod_sofia_la_CFLAGS += -I$(SOFIAUA_DIR)/tport -I$(SOFIAUA_DIR)/url mod_sofia_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SOFIALA) -mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined -lssl -lcrypto -ldl -lz -lrt -lpthread +mod_sofia_la_LDFLAGS = -avoid-version -module -no-undefined if ADD_ODBC mod_sofia_la_CFLAGS += -DSWITCH_HAVE_ODBC