Changeset 3999 for pjproject/trunk/third_party/build/resample/Makefile

Timestamp:

Mar 30, 2012 7:10:13 AM (13 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• third_party/build/resample/Makefile (modified) (4 diffs)

pjproject/trunk/third_party/build/resample/Makefile

@@ -6 +6 @@
 RULES_MAK := $(PJDIR)/build/rules.mak
 
-export RESAMPLE_LIB := ../../lib/libresample-$(TARGET_NAME)$(LIBEXT)
 
 ###############################################################################
@@ -23 +22 @@
 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 
@@ -30 +32 @@
 # $(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)
@@ -45 +58 @@
         $(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 $@