From 831823773e16aff2a237335145effd426d5ebf87 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sat, 23 Nov 2013 07:13:40 +0000 Subject: Fixed #1713: Enable building the libraries as shared libraries/DLLs for GNU targets git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4656 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip/build/Makefile | 139 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 104 insertions(+), 35 deletions(-) (limited to 'pjsip') diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 3914cf83..a10fdc7d 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -7,18 +7,32 @@ include ../../build.mak include ../../version.mak include $(PJDIR)/build/common.mak +export LIBDIR := ../lib +export BINDIR := ../bin + 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) - -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) +export PJSIP_LIB:=libpjsip-$(TARGET_NAME)$(LIBEXT) +export PJSIP_UA_LIB:=libpjsip-ua-$(TARGET_NAME)$(LIBEXT) +export PJSIP_SIMPLE_LIB:=libpjsip-simple-$(TARGET_NAME)$(LIBEXT) +export PJSUA_LIB_LIB:=libpjsua-$(TARGET_NAME)$(LIBEXT) + +ifeq ($(PJ_SHARED_LIBRARIES),) +else +export PJSIP_SONAME := libpjsip.$(SHLIB_SUFFIX) +export PJSIP_SHLIB := $(PJSIP_SONAME).$(PJ_VERSION_MAJOR) +export PJSIP_UA_SONAME := libpjsip-ua.$(SHLIB_SUFFIX) +export PJSIP_UA_SHLIB := $(PJSIP_UA_SONAME).$(PJ_VERSION_MAJOR) +export PJSIP_SIMPLE_SONAME := libpjsip-simple.$(SHLIB_SUFFIX) +export PJSIP_SIMPLE_SHLIB := $(PJSIP_SIMPLE_SONAME).$(PJ_VERSION_MAJOR) +export PJSUA_LIB_SONAME := libpjsua.$(SHLIB_SUFFIX) +export PJSUA_LIB_SHLIB := $(PJSUA_LIB_SONAME).$(PJ_VERSION_MAJOR) +endif ############################################################################### # Gather all flags. @@ -31,6 +45,10 @@ export _CFLAGS := $(CC_CFLAGS) $(OS_CFLAGS) $(HOST_CFLAGS) $(M_CFLAGS) \ $(CC_INC)../../pjmedia/include export _CXXFLAGS:= $(_CFLAGS) $(CC_CXXFLAGS) $(OS_CXXFLAGS) $(M_CXXFLAGS) \ $(HOST_CXXFLAGS) $(CXXFLAGS) +export _LDFLAGS := $(APP_THIRD_PARTY_LIBS) \ + $(APP_THIRD_PARTY_EXT) \ + $(CC_LDFLAGS) $(OS_LDFLAGS) $(M_LDFLAGS) $(HOST_LDFLAGS) \ + $(APP_LDFLAGS) $(LDFLAGS) ############################################################################### # Defines for building PJSIP core library @@ -49,6 +67,9 @@ export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ sip_dialog.o sip_ua_layer.o export PJSIP_CFLAGS += $(_CFLAGS) export PJSIP_CXXFLAGS += $(_CXXFLAGS) +export PJSIP_LDFLAGS += $(PJLIB_UTIL_LDLIB) \ + $(PJLIB_LDLIB) \ + $(_LDFLAGS) ############################################################################### # Defines for building PJSIP UA library @@ -59,6 +80,12 @@ export PJSIP_UA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ sip_100rel.o sip_timer.o export PJSIP_UA_CFLAGS += $(_CFLAGS) export PJSIP_UA_CXXFLAGS += $(_CXXFLAGS) +export PJSIP_UA_LDFLAGS += $(PJSIP_SIMPLE_LDLIB) \ + $(PJSIP_LDLIB) \ + $(PJMEDIA_LDLIB) \ + $(PJLIB_UTIL_LDLIB) \ + $(PJLIB_LDLIB) \ + $(_LDFLAGS) ############################################################################### @@ -71,6 +98,10 @@ export PJSIP_SIMPLE_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ rpid.o xpidf.o export PJSIP_SIMPLE_CFLAGS += $(_CFLAGS) export PJSIP_SIMPLE_CXXFLAGS += $(_CXXFLAGS) +export PJSIP_SIMPLE_LDFLAGS += $(PJSIP_LDLIB) \ + $(PJLIB_UTIL_LDLIB) \ + $(PJLIB_LDLIB) \ + $(_LDFLAGS) ############################################################################### @@ -83,6 +114,17 @@ export PJSUA_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ pjsua_dump.o pjsua_aud.o pjsua_vid.o export PJSUA_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) export PJSUA_LIB_CXXFLAGS += $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS) +export PJSUA_LIB_LDFLAGS += $(PJSIP_UA_LDLIB) \ + $(PJSIP_SIMPLE_LDLIB) \ + $(PJSIP_LDLIB) \ + $(PJMEDIA_AUDIODEV_LDLIB) \ + $(PJMEDIA_VIDEODEV_LDLIB) \ + $(PJMEDIA_CODEC_LDLIB) \ + $(PJMEDIA_LDLIB) \ + $(PJNATH_LDLIB) \ + $(PJLIB_UTIL_LDLIB) \ + $(PJLIB_LDLIB) \ + $(_LDFLAGS) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT @@ -100,8 +142,19 @@ export TEST_OBJS += dlg_core_test.o dns_test.o msg_err_test.o \ inv_offer_answer_test.o export TEST_CFLAGS += $(_CFLAGS) export TEST_CXXFLAGS += $(_CXXFLAGS) -export TEST_LDFLAGS += $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) -export TEST_EXE := ../bin/pjsip-test-$(TARGET_NAME)$(HOST_EXE) +export TEST_LDFLAGS += $(PJSIP_LDLIB) \ + $(PJSIP_UA_LDLIB) \ + $(PJSIP_SIMPLE_LDLIB) \ + $(PJSUA_LDLIB) \ + $(PJMEDIA_CODEC_LDLIB) \ + $(PJMEDIA_VIDEODEV_LDLIB) \ + $(PJMEDIA_LDLIB) \ + $(PJMEDIA_AUDIODEV_LDLIB) \ + $(PJLIB_LDLIB) \ + $(PJLIB_UTIL_LDLIB) \ + $(PJNATH_LDLIB) \ + $(_LDFLAGS) +export TEST_EXE := pjsip-test-$(TARGET_NAME)$(HOST_EXE) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT @@ -109,7 +162,11 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT # Main entry # # -TARGETS := pjsip pjsip-ua pjsip-simple pjsua-lib pjsip-test +TARGETS := $(PJSIP_LIB) $(PJSIP_SONAME) \ + $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) \ + $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) \ + $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) \ + $(TEST_EXE) all: $(TARGETS) @@ -127,49 +184,61 @@ doc: dep: depend distclean: realclean -.PHONY: dep depend clean realclean distclean +.PHONY: all dep depend clean realclean distclean .PHONY: $(TARGETS) -.PHONY: $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) $(PJSUA_LIB_LIB) $(TEST_EXE) +.PHONY: $(PJSIP_LIB) $(PJSIP_SONAME) +.PHONY: $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) +.PHONY: $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) +.PHONY: $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) +.PHONY: $(TEST_EXE) pjsip: $(PJSIP_LIB) -$(PJSIP_LIB): - $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(PJSIP_LIB) +$(PJSIP_SONAME): $(PJSIP_LIB) +$(PJSIP_LIB) $(PJSIP_SONAME): + $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) pjsip-ua: $(PJSIP_UA_LIB) -$(PJSIP_UA_LIB): - $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(PJSIP_UA_LIB) +$(PJSIP_UA_SONAME): $(PJSIP_UA_LIB) +$(PJSIP_UA_LIB) $(PJSIP_UA_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) + $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) pjsip-simple: $(PJSIP_SIMPLE_LIB) -$(PJSIP_SIMPLE_LIB): - $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(PJSIP_SIMPLE_LIB) +$(PJSIP_SIMPLE_SONAME): $(PJSIP_SIMPLE_LIB) +$(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) + $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) pjsua-lib: $(PJSUA_LIB_LIB) -$(PJSUA_LIB_LIB): - $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(PJSUA_LIB_LIB) +$(PJSUA_LIB_SONAME): $(PJSUA_LIB_LIB) +$(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) + $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) pjsip-test: $(TEST_EXE) -$(TEST_EXE): $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB) - $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(TEST_EXE) - -.PHONY: ../lib/pjsip.ko -../lib/pjsip.ko: +$(TEST_EXE): $(PJSIP_LIB) $(PJSIP_SONAME) +$(TEST_EXE): $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) +$(TEST_EXE): $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) +$(TEST_EXE): $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME) +$(TEST_EXE): + $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $(subst /,$(HOST_PSEP),$(BINDIR)/$@) + +.PHONY: pjsip.ko +pjsip.ko: echo Making $@ - $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@ + $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) -.PHONY: ../lib/pjsip-ua.ko -../lib/pjsip-ua.ko: +.PHONY: pjsip-ua.ko +pjsip-ua.ko: echo Making $@ - $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@ + $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) -.PHONY: ../lib/pjsip-simple.ko -../lib/pjsip-simple.ko: +.PHONY: pjsip-simple.ko +pjsip-simple.ko: echo Making $@ - $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ + $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) -.PHONY: ../lib/pjsua-lib.ko -../lib/pjsua-lib.ko: +.PHONY: pjsua-lib.ko +pjsua-lib.ko: echo Making $@ - $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ + $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) clean: $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@ @@ -184,7 +253,7 @@ depend: $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ - echo '$(TEST_EXE): $(PJMEDIA_LIB) $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend + echo '$(BINDIR)/$(TEST_EXE): $(PJMEDIA_LIB) $(LIBDIR)/$(PJSUA_LIB_LIB) $(LIBDIR)/$(PJSIP_SIMPLE_LIB) $(LIBDIR)/$(PJSIP_UA_LIB) $(LIBDIR)/$(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend realclean: $(subst @@,$(subst /,$(HOST_PSEP),.pjsip-$(TARGET_NAME).depend),$(HOST_RMR)) -- cgit v1.2.3