From 9c6ec431c2dca82b088e77a5e9d3dff80818d8da Mon Sep 17 00:00:00 2001 From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Date: Mon, 24 Aug 2009 14:05:50 -0400 Subject: [PATCH] [#1797] Make pjproject-1.4 compile --- sflphone-common/configure.ac | 2 +- sflphone-common/globals.mak | 2 +- sflphone-common/libs/pjproject-1.4/Makefile | 21 +++++----- .../libs/pjproject-1.4/build.mak.in | 38 +++++++++---------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index 4c818257e9..30cf2289ec 100644 --- a/sflphone-common/configure.ac +++ b/sflphone-common/configure.ac @@ -421,6 +421,6 @@ AC_SUBST(DBUS_SERVICES_DIR) AC_SUBST(SFLPHONE_CFLAGS) AC_SUBST(SFLPHONE_LIBS) AC_OUTPUT - AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.3) has already been compiled. Run `make' to build the software.]]) + AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.4) has already been compiled. Run `make' to build the software.]]) diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak index 51fe32ac48..858eb8fbb4 100644 --- a/sflphone-common/globals.mak +++ b/sflphone-common/globals.mak @@ -6,7 +6,7 @@ sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins ASTYLERC="../astylerc" indent="/usr/bin/astyle" -PJSIP_VERSION="1.0.3" +PJSIP_VERSION="1.4" # for pjsip PJSIP_LIBS= \ diff --git a/sflphone-common/libs/pjproject-1.4/Makefile b/sflphone-common/libs/pjproject-1.4/Makefile index c6e7b62c4f..e3a01e658c 100644 --- a/sflphone-common/libs/pjproject-1.4/Makefile +++ b/sflphone-common/libs/pjproject-1.4/Makefile @@ -29,16 +29,17 @@ doc: fi; \ done -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) +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-audiodev-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/sflphone-common/libs/pjproject-1.4/build.mak.in b/sflphone-common/libs/pjproject-1.4/build.mak.in index e393eb7174..57a988130e 100644 --- a/sflphone-common/libs/pjproject-1.4/build.mak.in +++ b/sflphone-common/libs/pjproject-1.4/build.mak.in @@ -60,28 +60,28 @@ export APP_LDFLAGS := -L$(PJDIR)/pjlib/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)\ - -lpjmedia-audiodev-$(TARGET_NAME)\ - -lpjnath-$(TARGET_NAME)\ - -lpjlib-util-$(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)\ + -lpjmedia-audiodev-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)/pjmedia/lib/libpjmedia-audiodev-$(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)/pjmedia/lib/libpjmedia-audiodev-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) -- GitLab