diff --git a/libs/pjproject-1.0/Makefile b/libs/pjproject-1.0/Makefile index 7afdec0d1d1a161af409231a26ce79d4089fbb7d..c8406d7c37713fce889ce3b4c1694aeb91d1e295 100644 --- a/libs/pjproject-1.0/Makefile +++ b/libs/pjproject-1.0/Makefile @@ -29,16 +29,16 @@ doc: fi; \ done -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-codec-$(TARGET_NAME).a \ - pjsip/lib/libpjsip-$(TARGET_NAME).a \ - pjsip/lib/libpjsip-ua-$(TARGET_NAME).a \ - pjsip/lib/libpjsip-simple-$(TARGET_NAME).a \ - pjsip/lib/libpjsua-$(TARGET_NAME).a -BINS = pjsip-apps/bin/pjsua-$(TARGET_NAME)$(HOST_EXE) +LIBS = pjlib/lib/libpj-sfl-$(TARGET_NAME).a \ + pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME).a \ + pjnath/lib/libpjnath-sfl-$(TARGET_NAME).a \ + pjmedia/lib/libpjmedia-sfl-$(TARGET_NAME).a \ + pjmedia/lib/libpjmedia-codec-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsip-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsip-ua-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsip-simple-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsua-sfl-$(TARGET_NAME).a +BINS = pjsip-apps/bin/pjsua-sfl-$(TARGET_NAME)$(HOST_EXE) size: @echo -n 'Date: ' diff --git a/libs/pjproject-1.0/build.mak.in b/libs/pjproject-1.0/build.mak.in index d0fea1590b22d07b80048b223aa608cb1cc3f049..4554f6f3a53b11c4e59c30b80148873f5725cf56 100644 --- a/libs/pjproject-1.0/build.mak.in +++ b/libs/pjproject-1.0/build.mak.in @@ -54,27 +54,27 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\ -L$(PJDIR)/pjsip/lib\ -L$(PJDIR)/third_party/lib\ @LDFLAGS@ -export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\ - -lpjsip-ua-$(TARGET_NAME)\ - -lpjsip-simple-$(TARGET_NAME)\ - -lpjsip-$(TARGET_NAME)\ - -lpjmedia-codec-$(TARGET_NAME)\ - -lpjmedia-$(TARGET_NAME)\ - -lpjnath-$(TARGET_NAME)\ - -lpjlib-util-$(TARGET_NAME)\ +export APP_LDLIBS := -lpjsua-sfl-$(TARGET_NAME)\ + -lpjsip-ua-sfl-$(TARGET_NAME)\ + -lpjsip-simple-sfl-$(TARGET_NAME)\ + -lpjsip-sfl-$(TARGET_NAME)\ + -lpjmedia-codec-sfl-$(TARGET_NAME)\ + -lpjmedia-sfl-$(TARGET_NAME)\ + -lpjnath-sfl-$(TARGET_NAME)\ + -lpjlib-util-sfl-$(TARGET_NAME)\ $(APP_THIRD_PARTY_LIBS)\ - -lpj-$(TARGET_NAME)\ + -lpj-sfl-$(TARGET_NAME)\ @LIBS@ -export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-$(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-codec-$(LIB_SUFFIX) \ - $(PJ_DIR)/pjmedia/lib/libpjmedia-$(LIB_SUFFIX) \ - $(PJ_DIR)/pjnath/lib/libpjnath-$(LIB_SUFFIX) \ - $(PJ_DIR)/pjlib-util/lib/libpjlib-util-$(LIB_SUFFIX) \ +export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjsip/lib/libpjsip-ua-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjsip/lib/libpjsip-simple-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjsip/lib/libpjsip-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjmedia/lib/libpjmedia-codec-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjmedia/lib/libpjmedia-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjnath/lib/libpjnath-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjlib-util/lib/libpjlib-util-sfl-$(LIB_SUFFIX) \ $(APP_THIRD_PARTY_LIB_FILES) \ - $(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX) + $(PJ_DIR)/pjlib/lib/libpj-sfl-$(LIB_SUFFIX) export PJ_DIR := $(PJDIR) export PJ_CC := $(APP_CC) diff --git a/libs/pjproject-1.0/build/rules.mak b/libs/pjproject-1.0/build/rules.mak index bbe0ab1942efd6cf93e7388ff13e9fea19c901c0..9ee3fba5f5ae080ac139534b843344ff52274a17 100644 --- a/libs/pjproject-1.0/build/rules.mak +++ b/libs/pjproject-1.0/build/rules.mak @@ -80,7 +80,7 @@ $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) $(RANLIB) $(LIB) $(EXE): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) - if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi + if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \ $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) diff --git a/libs/pjproject-1.0/pjlib-util/build/Makefile b/libs/pjproject-1.0/pjlib-util/build/Makefile index ef0939af690d2c30f6f230168b319f379b2e1323..52256f1cf0eb74296819a7523a25755f9d519df7 100644 --- a/libs/pjproject-1.0/pjlib-util/build/Makefile +++ b/libs/pjproject-1.0/pjlib-util/build/Makefile @@ -7,8 +7,8 @@ include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak -PJLIB_LIB:=$(PJDIR)/pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) -export PJLIB_UTIL_LIB:=../lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) +PJLIB_LIB:=$(PJDIR)/pjlib/lib/libpj-sfl-$(TARGET_NAME)$(LIBEXT) +export PJLIB_UTIL_LIB:=../lib/libpjlib-util-sfl-$(TARGET_NAME)$(LIBEXT) ############################################################################### # Gather all flags. @@ -22,6 +22,7 @@ export _LDFLAGS := $(subst /,$(HOST_PSEP),$(PJLIB_UTIL_LIB)) \ $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ $(LDFLAGS) + ############################################################################### # Defines for building PJLIB-UTIL library # @@ -52,7 +53,6 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT TARGETS := pjlib-util pjlib-util-test all: $(TARGETS) - doc: cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg @if test ! "$(WWWDIR)" == ""; then \ diff --git a/libs/pjproject-1.0/pjlib/build/Makefile b/libs/pjproject-1.0/pjlib/build/Makefile index c3819f34e57a0ff21400387931f6e2334dbd2d1b..5fed97cd5cc3c55bc366c82c9cab422b4796ec7a 100644 --- a/libs/pjproject-1.0/pjlib/build/Makefile +++ b/libs/pjproject-1.0/pjlib/build/Makefile @@ -4,7 +4,7 @@ include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak -export PJLIB_LIB := ../lib/libpj-$(TARGET_NAME)$(LIBEXT) +export PJLIB_LIB := ../lib/libpj-sfl-$(TARGET_NAME)$(LIBEXT) ############################################################################### # Gather all flags. diff --git a/libs/pjproject-1.0/pjmedia/build/Makefile b/libs/pjproject-1.0/pjmedia/build/Makefile index 291339a76da1cf8e1e9c791bd534183d99429a59..504496a32f1c2225e0daca5148a265b983891943 100644 --- a/libs/pjproject-1.0/pjmedia/build/Makefile +++ b/libs/pjproject-1.0/pjmedia/build/Makefile @@ -11,13 +11,13 @@ include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak -PJLIB_LIB:=$(PJDIR)/pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) -PJLIB_UTIL_LIB:=$(PJDIR)/pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) -PJNATH_LIB:=$(PJDIR)/pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) +PJLIB_LIB:=$(PJDIR)/pjlib/lib/libpj-sfl-$(TARGET_NAME)$(LIBEXT) +PJLIB_UTIL_LIB:=$(PJDIR)/pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME)$(LIBEXT) +PJNATH_LIB:=$(PJDIR)/pjnath/lib/libpjnath-sfl-$(TARGET_NAME)$(LIBEXT) -export PJMEDIA_LIB:=../lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) -export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) -export PJSDP_LIB:=../lib/libpjsdp-$(TARGET_NAME)$(LIBEXT) +export PJMEDIA_LIB:=../lib/libpjmedia-sfl-$(TARGET_NAME)$(LIBEXT) +export PJMEDIA_CODEC_LIB:=../lib/libpjmedia-codec-sfl-$(TARGET_NAME)$(LIBEXT) +export PJSDP_LIB:=../lib/libpjsdp-sfl-$(TARGET_NAME)$(LIBEXT) NULLSOUND_OBJS := nullsound.o diff --git a/libs/pjproject-1.0/pjnath/build/Makefile b/libs/pjproject-1.0/pjnath/build/Makefile index 3012659f48b8c989c814c9a15c1265b9463f2e74..13bd9f65862776b882f21c960bf4e8d3f305124b 100644 --- a/libs/pjproject-1.0/pjnath/build/Makefile +++ b/libs/pjproject-1.0/pjnath/build/Makefile @@ -7,9 +7,9 @@ include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak -PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) -PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) -export PJNATH_LIB:=../lib/libpjnath-$(TARGET_NAME)$(LIBEXT) +PJLIB_LIB:=../../pjlib/lib/libpj-sfl-$(TARGET_NAME)$(LIBEXT) +PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME)$(LIBEXT) +export PJNATH_LIB:=../lib/libpjnath-sfl-$(TARGET_NAME)$(LIBEXT) ############################################################################### # Gather all flags. diff --git a/libs/pjproject-1.0/pjsip-apps/build/Makefile b/libs/pjproject-1.0/pjsip-apps/build/Makefile index ac004c58163d4581b4a36e6948ca070b3f50da40..edb018e60f6feefd2120df9feb85149134234d0c 100644 --- a/libs/pjproject-1.0/pjsip-apps/build/Makefile +++ b/libs/pjproject-1.0/pjsip-apps/build/Makefile @@ -4,15 +4,15 @@ include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak -PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) -PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) -PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT) -PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) -PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) -PJSIP_LIB:=../../pjsip/lib/libpjsip-$(TARGET_NAME)$(LIBEXT) -PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) -PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) -PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-$(TARGET_NAME)$(LIBEXT) +PJLIB_LIB:=../../pjlib/lib/libpj-sfl-$(TARGET_NAME)$(LIBEXT) +PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME)$(LIBEXT) +PJNATH_LIB:=../../pjnath/lib/libpjnath-sfl-$(TARGET_NAME)$(LIBEXT) +PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-sfl-$(TARGET_NAME)$(LIBEXT) +PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-sfl-$(TARGET_NAME)$(LIBEXT) +PJSIP_LIB:=../../pjsip/lib/libpjsip-sfl-$(TARGET_NAME)$(LIBEXT) +PJSIP_UA_LIB:=../../pjsip/lib/libpjsip-ua-sfl-$(TARGET_NAME)$(LIBEXT) +PJSIP_SIMPLE_LIB:=../../pjsip/lib/libpjsip-simple-sfl-$(TARGET_NAME)$(LIBEXT) +PJSUA_LIB_LIB=../../pjsip/lib/libpjsua-sfl-$(TARGET_NAME)$(LIBEXT) ############################################################################### diff --git a/libs/pjproject-1.0/pjsip/build/Makefile b/libs/pjproject-1.0/pjsip/build/Makefile index 9400f26aa5ca5034c1f3ded0d84b1eeeef5b9844..a2407c72f057aaa1cace07a139254868d01d2c27 100644 --- a/libs/pjproject-1.0/pjsip/build/Makefile +++ b/libs/pjproject-1.0/pjsip/build/Makefile @@ -8,15 +8,15 @@ include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak -PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT) -PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) -PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-$(TARGET_NAME)$(LIBEXT) -PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-$(TARGET_NAME)$(LIBEXT) - -export PJSIP_LIB:=../lib/libpjsip-$(TARGET_NAME)$(LIBEXT) -export PJSIP_UA_LIB:=../lib/libpjsip-ua-$(TARGET_NAME)$(LIBEXT) -export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-$(TARGET_NAME)$(LIBEXT) -export PJSUA_LIB_LIB=../lib/libpjsua-$(TARGET_NAME)$(LIBEXT) +PJLIB_LIB:=../../pjlib/lib/libpj-sfl-$(TARGET_NAME)$(LIBEXT) +PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME)$(LIBEXT) +PJMEDIA_LIB:=../../pjmedia/lib/libpjmedia-sfl-$(TARGET_NAME)$(LIBEXT) +PJMEDIA_CODEC_LIB:=../../pjmedia/lib/libpjmedia-codec-sfl-$(TARGET_NAME)$(LIBEXT) + +export PJSIP_LIB:=../lib/libpjsip-sfl-$(TARGET_NAME)$(LIBEXT) +export PJSIP_UA_LIB:=../lib/libpjsip-ua-sfl-$(TARGET_NAME)$(LIBEXT) +export PJSIP_SIMPLE_LIB:=../lib/libpjsip-simple-sfl-$(TARGET_NAME)$(LIBEXT) +export PJSUA_LIB_LIB=../lib/libpjsua-sfl-$(TARGET_NAME)$(LIBEXT) ###############################################################################