From aa978eb3db4ea3b63566965a11730d5ff5da3500 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Fri, 15 Feb 2013 12:54:17 -0600
Subject: More fixes for dependencies, and to be more consistent.

---
 third_party/build/resample/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'third_party/build/resample')

diff --git a/third_party/build/resample/Makefile b/third_party/build/resample/Makefile
index 8b0423e..72ba28a 100644
--- a/third_party/build/resample/Makefile
+++ b/third_party/build/resample/Makefile
@@ -21,9 +21,13 @@ export RESAMPLE_SRCDIR = ../../resample/src
 export RESAMPLE_OBJS = resamplesubs.o
 export RESAMPLE_CFLAGS = $(_CFLAGS)
 
+export RESAMPLE_LIB := libresample-$(TARGET_NAME)$(LIBEXT)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+else
 export RESAMPLE_SONAME := libresample.$(SHLIB_SUFFIX)
 export RESAMPLE_SHLIB := $(RESAMPLE_SONAME).$(PJ_VERSION_MAJOR)
-export RESAMPLE_LIB := libresample-$(TARGET_NAME)$(LIBEXT)
+endif
 
 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
 ###############################################################################
@@ -31,12 +35,10 @@ 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.
 #
-TARGETS := $(RESAMPLE_LIB)
+TARGETS := $(RESAMPLE_LIB) $(RESAMPLE_SONAME)
 ifneq ($(PJ_SHARED_LIBRARIES),)
-TARGETS += $(RESAMPLE_SONAME)
 else
 ifneq ($(PJ_RESAMPLE_DLL),)
-TARGETS += $(RESAMPLE_SONAME)
 export RESAMPLE_CFLAGS := -fPIC $(RESAMPLE_CFLAGS)
 endif
 endif
@@ -51,14 +53,13 @@ distclean: realclean
 
 .PHONY: all dep depend clean realclean distclean
 .PHONY: $(TARGETS)
-.PHONY: $(RESAMPLE_LIB) $(RESAMPLE_SHLIB) $(RESAMPLE_SONAME)
+.PHONY: $(RESAMPLE_LIB) $(RESAMPLE_SONAME)
 
 dep: depend
 
 libresample: $(RESAMPLE_LIB)
-$(RESAMPLE_SHLIB): $(RESAMPLE_SONAME)
 $(RESAMPLE_SONAME): $(RESAMPLE_LIB)
-$(RESAMPLE_LIB) $(RESAMPLE_SHLIB) $(RESAMPLE_SONAME):
+$(RESAMPLE_LIB) $(RESAMPLE_SONAME):
 	$(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 clean print_lib:
-- 
cgit v1.2.3