diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
| commit | 6b4964727bffb379aca9601e1cf69051ccbf600c (patch) | |
| tree | 1d9739ea8b3b5e0421f1d99b39e798b1514fb644 /third_party | |
| parent | 85ac546acb235df62169c4ad317da74a62e56a88 (diff) | |
Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3999 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/build/resample/Makefile | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/third_party/build/resample/Makefile b/third_party/build/resample/Makefile index 32f46ef2..2deb8732 100644 --- a/third_party/build/resample/Makefile +++ b/third_party/build/resample/Makefile @@ -5,7 +5,6 @@ export LIBDIR := ../../lib RULES_MAK := $(PJDIR)/build/rules.mak -export RESAMPLE_LIB := ../../lib/libresample-$(TARGET_NAME)$(LIBEXT) ############################################################################### # Gather all flags. @@ -22,6 +21,9 @@ export RESAMPLE_SRCDIR = ../../resample/src export RESAMPLE_OBJS = resamplesubs.o export RESAMPLE_CFLAGS = $(_CFLAGS) +SHLIB_NAME := libresample.$(SHLIB_SUFFIX) +export RESAMPLE_SHLIB := ../../lib/$(SHLIB_NAME).$(PJ_VERSION_MAJOR) +export RESAMPLE_LIB := ../../lib/libresample-$(TARGET_NAME)$(LIBEXT) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT ############################################################################### @@ -29,7 +31,18 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT # # $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. # +ifeq ($(PJ_RESAMPLE_DLL),1) +TARGETS := ../../lib/$(SHLIB_NAME) +ifeq ($(SHLIB_SUFFIX),so) +SHLIB_OPT := -Wl,-soname,$(SHLIB_NAME).$(PJ_VERSION_MAJOR) +else +SHLIB_OPT := +endif +export RESAMPLE_CFLAGS := -fPIC $(RESAMPLE_CFLAGS) +export RESAMPLE_LDFLAGS := -shared $(SHLIB_OPT) $(RESAMPLE_LDFLAGS) +else TARGETS := libresample +endif all: $(TARGETS) @@ -44,12 +57,18 @@ distclean: realclean libresample: $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(RESAMPLE_LIB) +../../lib/$(SHLIB_NAME): $(RESAMPLE_SHLIB) + ln -s $(SHLIB_NAME).$(PJ_VERSION_MAJOR) $@ + +$(RESAMPLE_SHLIB): + $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(RESAMPLE_SHLIB) + clean print_lib: $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $@ realclean: - $(subst @@,$(subst /,$(HOST_PSEP),.ilbc-$(TARGET_NAME).depend),$(HOST_RMR)) - + $(subst @@,$(subst /,$(HOST_PSEP),../../lib/$(SHLIB_NAME)),$(HOST_RMR)) + $(subst @@,$(subst /,$(HOST_PSEP),$(RESAMPLE_SHLIB)),$(HOST_RMR)) $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $@ depend: |