Ignore:
Timestamp:
Mar 30, 2012 7:10:13 AM (9 years ago)
Author:
bennylp
Message:

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

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

  • pjproject/trunk/third_party/build/resample/Makefile

    r2183 r3999  
    66RULES_MAK := $(PJDIR)/build/rules.mak 
    77 
    8 export RESAMPLE_LIB := ../../lib/libresample-$(TARGET_NAME)$(LIBEXT) 
    98 
    109############################################################################### 
     
    2322export RESAMPLE_CFLAGS = $(_CFLAGS) 
    2423 
     24SHLIB_NAME := libresample.$(SHLIB_SUFFIX) 
     25export RESAMPLE_SHLIB := ../../lib/$(SHLIB_NAME).$(PJ_VERSION_MAJOR) 
     26export RESAMPLE_LIB := ../../lib/libresample-$(TARGET_NAME)$(LIBEXT) 
    2527 
    2628export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT  
     
    3032# $(TARGET) is defined in os-$(OS_NAME).mak file in current directory. 
    3133# 
     34ifeq ($(PJ_RESAMPLE_DLL),1) 
     35TARGETS := ../../lib/$(SHLIB_NAME) 
     36ifeq ($(SHLIB_SUFFIX),so) 
     37SHLIB_OPT := -Wl,-soname,$(SHLIB_NAME).$(PJ_VERSION_MAJOR) 
     38else 
     39SHLIB_OPT :=  
     40endif 
     41export RESAMPLE_CFLAGS := -fPIC $(RESAMPLE_CFLAGS) 
     42export RESAMPLE_LDFLAGS := -shared $(SHLIB_OPT) $(RESAMPLE_LDFLAGS) 
     43else 
    3244TARGETS := libresample 
     45endif 
    3346 
    3447all: $(TARGETS) 
     
    4558        $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(RESAMPLE_LIB) 
    4659 
     60../../lib/$(SHLIB_NAME): $(RESAMPLE_SHLIB) 
     61        ln -s $(SHLIB_NAME).$(PJ_VERSION_MAJOR) $@ 
     62 
     63$(RESAMPLE_SHLIB): 
     64        $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(RESAMPLE_SHLIB) 
     65         
    4766clean print_lib: 
    4867        $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $@ 
    4968 
    5069realclean: 
    51         $(subst @@,$(subst /,$(HOST_PSEP),.ilbc-$(TARGET_NAME).depend),$(HOST_RMR)) 
    52          
     70        $(subst @@,$(subst /,$(HOST_PSEP),../../lib/$(SHLIB_NAME)),$(HOST_RMR)) 
     71        $(subst @@,$(subst /,$(HOST_PSEP),$(RESAMPLE_SHLIB)),$(HOST_RMR)) 
    5372        $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $@ 
    5473 
Note: See TracChangeset for help on using the changeset viewer.