[#1317] Updated pjsip inclusion in build system

sflphone-common/configure.ac

@@ -153,9 +153,6 @@ PKG_PROG_PKG_CONFIG
 #fi
 #AC_SUBST(SIP_CFLAGS)
 
-TARGET_NAME=`ls libs/pjproject-1.0.1/pjmedia/lib/libpjmedia-codec-sfl-* | xargs -i basename {} | cut -d '-' -f4- | cut -d "." -f1`
-AC_SUBST(TARGET_NAME)
-
 dnl Check for uuid development package - name: uuid-dev 
 UUID_MIN_VERSION=1.0
 PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION})

sflphone-common/globals.mak

@@ -10,7 +10,15 @@ PJSIP_LIBS= \
 			-L$(src)/libs/pjproject-1.0.1/pjlib/ \
 			-L$(src)/libs/pjproject-1.0.1/pjlib-util/ \
 			-L$(src)/libs/pjproject-1.0.1/pjmedia/ \
-			-lpjnath-sfl-$(TARGET_NAME) -lpjsua-sfl-$(TARGET_NAME) -lpjsip-sfl-$(TARGET_NAME) -lpjmedia-sfl-$(TARGET_NAME) -lpjsip-simple-sfl-$(TARGET_NAME) -lpjsip-ua-sfl-$(TARGET_NAME) -lpjmedia-codec-sfl-$(TARGET_NAME) -lpjlib-util-sfl-$(TARGET_NAME) -lpj-sfl-$(TARGET_NAME)
+			-lpjnath-sfl-$(target) \
+			-lpjsua-sfl-$(target) \
+			-lpjsip-sfl-$(target) \
+			-lpjmedia-sfl-$(target) \
+			-lpjsip-simple-sfl-$(target) \
+			-lpjsip-ua-sfl-$(target) \
+			-lpjmedia-codec-sfl-$(target) \
+			-lpjlib-util-sfl-$(target) \
+			-lpj-sfl-$(target)
 
 SIP_CFLAGS=-I$(src)/libs/pjproject-1.0.1/pjsip/include \
 		   -I$(src)/libs/pjproject-1.0.1/pjlib/include \