[asterisk-commits] file: branch group/pimp_my_sip r379309 - in /team/group/pimp_my_sip/res: ./ p...

[SVN commits to the Asterisk project]

Author: file
Date: Wed Jan 16 15:50:04 2013
New Revision: 379309

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379309
Log:
Get the required pjsip/pjmedia components building and link them against res_sip.

Modified:
    team/group/pimp_my_sip/res/Makefile
    team/group/pimp_my_sip/res/pjproject/Makefile
    team/group/pimp_my_sip/res/pjproject/build.mak.in
    team/group/pimp_my_sip/res/pjproject/pjmedia/build/Makefile
    team/group/pimp_my_sip/res/pjproject/pjsip/build/Makefile

Modified: team/group/pimp_my_sip/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/Makefile?view=diff&rev=379309&r1=379308&r2=379309
==============================================================================
--- team/group/pimp_my_sip/res/Makefile (original)
+++ team/group/pimp_my_sip/res/Makefile Wed Jan 16 15:50:04 2013
@@ -86,3 +86,8 @@
 res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
 res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
 res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
+
+res_sip.o: $(PJ_LIB_FILES)
+res_sip.o: _ASTCFLAGS+=$(PJ_CFLAGS)
+res_sip.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
+res_sip.so: LIBS+=$(PJ_LDLIBS)

Modified: team/group/pimp_my_sip/res/pjproject/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/pjproject/Makefile?view=diff&rev=379309&r1=379308&r2=379309
==============================================================================
--- team/group/pimp_my_sip/res/pjproject/Makefile (original)
+++ team/group/pimp_my_sip/res/pjproject/Makefile Wed Jan 16 15:50:04 2013
@@ -3,8 +3,8 @@
 -include user.mak
 include version.mak
 
-LIB_DIRS = pjlib/build pjlib-util/build pjnath/build #third_party/build pjmedia/build pjsip/build
-DIRS = $(LIB_DIRS) #pjsip-apps/build $(EXTRA_DIRS)
+LIB_DIRS = pjlib/build pjlib-util/build pjnath/build pjmedia/build pjsip/build #third_party/build
+DIRS = $(LIB_DIRS) # pjsip-apps/build $(EXTRA_DIRS)
 
 ifdef MINSIZE
 MAKE_FLAGS := MINSIZE=1
@@ -47,7 +47,10 @@
 LIBS = 	pjlib/lib/libpj-$(TARGET_NAME).a \
 	pjlib-util/lib/libpjlib-util-$(TARGET_NAME).a \
 	pjnath/lib/libpjnath-$(TARGET_NAME).a \
-#	pjmedia/lib/libpjmedia-$(TARGET_NAME).a \
+	pjmedia/lib/libpjmedia-$(TARGET_NAME).a \
+        pjsip/lib/libpjsip-$(TARGET_NAME).a \
+        pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \
+        pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \
 #	pjmedia/lib/libpjmedia-audiodev-$(TARGET_NAME).a \
 #	pjmedia/lib/libpjmedia-codec-$(TARGET_NAME).a \
 #    	pjsip/lib/libpjsip-$(TARGET_NAME).a \

Modified: team/group/pimp_my_sip/res/pjproject/build.mak.in
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/pjproject/build.mak.in?view=diff&rev=379309&r1=379308&r2=379309
==============================================================================
--- team/group/pimp_my_sip/res/pjproject/build.mak.in (original)
+++ team/group/pimp_my_sip/res/pjproject/build.mak.in Wed Jan 16 15:50:04 2013
@@ -125,9 +125,17 @@
 export APP_LDLIBS := -lpjnath-$(TARGET_NAME)\
 	-lpjlib-util-$(TARGET_NAME)\
 	-lpj-$(TARGET_NAME)\
+        -lpjsip-ua-$(TARGET_NAME)\
+        -lpjsip-simple-$(TARGET_NAME)\
+        -lpjsip-$(TARGET_NAME)\
+	-lpjmedia-$(TARGET_NAME)\
 	@LIBS@
 export APP_LIB_FILES = $(PJ_DIR)/pjnath/lib/libpjnath-$(LIB_SUFFIX) \
 	$(PJ_DIR)/pjlib-util/lib/libpjlib-util-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-ua-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-simple-$(LIB_SUFFIX) \
+        $(PJ_DIR)/pjsip/lib/libpjsip-$(LIB_SUFFIX) \
+	$(PJ_DIR)/pjmedia/lib/libpjmedia-$(LIB_SUFFIX) \
 	$(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX)
 
 # Here are the variabels to use if application is using the library

Modified: team/group/pimp_my_sip/res/pjproject/pjmedia/build/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/pjproject/pjmedia/build/Makefile?view=diff&rev=379309&r1=379308&r2=379309
==============================================================================
--- team/group/pimp_my_sip/res/pjproject/pjmedia/build/Makefile (original)
+++ team/group/pimp_my_sip/res/pjproject/pjmedia/build/Makefile Wed Jan 16 15:50:04 2013
@@ -138,7 +138,7 @@
 #
 # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory.
 #
-TARGETS := pjmedia pjmedia-videodev pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test
+TARGETS := pjmedia pjsdp #pjmedia pjmedia-videodev pjmedia-audiodev pjmedia-codec pjsdp pjmedia-test
 
 all: $(TARGETS)
 

Modified: team/group/pimp_my_sip/res/pjproject/pjsip/build/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/pimp_my_sip/res/pjproject/pjsip/build/Makefile?view=diff&rev=379309&r1=379308&r2=379309
==============================================================================
--- team/group/pimp_my_sip/res/pjproject/pjsip/build/Makefile (original)
+++ team/group/pimp_my_sip/res/pjproject/pjsip/build/Makefile Wed Jan 16 15:50:04 2013
@@ -104,7 +104,7 @@
 # Main entry
 #
 #
-TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test
+TARGETS := pjsip pjsip-ua pjsip-simple #pjsua-lib pjsip-test
 
 .PHONY: $(TARGETS)