From 29531157bcbaf915153ad1179c538a5161ea5e2c Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Tue, 29 Jul 2008 11:42:20 +0000 Subject: Fixed ticket #581: Fixed build dependencies in the makefiles git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2183 74dad513-b988-da41-8d7b-12977e46ad98 --- build.mak.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'build.mak.in') diff --git a/build.mak.in b/build.mak.in index 27f43919..57ee2c6f 100644 --- a/build.mak.in +++ b/build.mak.in @@ -7,23 +7,30 @@ export TARGET_NAME := @target@ export CROSS_COMPILE := @ac_cross_compile@ export LINUX_POLL := @ac_linux_poll@ +LIB_SUFFIX = $(TARGET_NAME).a + # Determine which party libraries to use export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) +export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) ifneq (@ac_no_gsm_codec@,1) APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX) endif ifneq (@ac_no_speex_codec@,1) APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX) endif ifneq (@ac_no_ilbc_codec@,1) APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX) endif ifneq ($(findstring pa,@ac_pjmedia_snd@),) APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX) endif @@ -56,6 +63,16 @@ export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\ $(APP_THIRD_PARTY_LIBS)\ -lpj-$(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) \ + $(APP_THIRD_PARTY_LIB_FILES) \ + $(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX) export PJ_DIR := $(PJDIR) export PJ_CC := $(APP_CC) @@ -63,4 +80,5 @@ export PJ_CFLAGS := $(APP_CFLAGS) export PJ_CXXFLAGS := $(APP_CXXFLAGS) export PJ_LDFLAGS := $(APP_LDFLAGS) export PJ_LDLIBS := $(APP_LDLIBS) +export PJ_LIB_FILES := $(APP_LIB_FILES) -- cgit v1.2.3