From 36194f13ae01a7f5578104fcb7e022fe81c83464 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Fri, 15 Feb 2013 12:54:17 -0600 Subject: More fixes for dependencies, and to be more consistent. --- third_party/build/speex/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'third_party/build/speex') diff --git a/third_party/build/speex/Makefile b/third_party/build/speex/Makefile index 49bf2ff..7e5e6fd 100644 --- a/third_party/build/speex/Makefile +++ b/third_party/build/speex/Makefile @@ -5,9 +5,13 @@ export LIBDIR := ../../lib RULES_MAK := $(PJDIR)/build/rules.mak +export SPEEX_LIB := libspeex-$(TARGET_NAME)$(LIBEXT) + +ifeq ($(PJ_SHARED_LIBRARIES),) +else export SPEEX_SONAME := libspeex.$(SHLIB_SUFFIX) export SPEEX_SHLIB := $(SPEEX_SONAME).$(PJ_VERSION_MAJOR) -export SPEEX_LIB := libspeex-$(TARGET_NAME)$(LIBEXT) +endif ############################################################################### # Gather all flags. @@ -46,10 +50,7 @@ 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 := $(SPEEX_LIB) -ifneq ($(PJ_SHARED_LIBRARIES),) -TARGETS += $(SPEEX_SONAME) -endif +TARGETS := $(SPEEX_LIB) $(SPEEX_SONAME) all: $(TARGETS) @@ -61,12 +62,11 @@ distclean: realclean .PHONY: all dep depend clean realclean distclean .PHONY: $(TARGETS) -.PHONY: $(SPEEX_LIB) $(SPEEX_SHLIB) $(SPEEX_SONAME) +.PHONY: $(SPEEX_LIB) $(SPEEX_SONAME) libspeex: $(SPEEX_LIB) -$(SPEEX_SHLIB): $(SPEEX_SONAME) $(SPEEX_SONAME): $(SPEEX_LIB) -$(SPEEX_LIB) $(SPEEX_SHLIB) $(SPEEX_SONAME): +$(SPEEX_LIB) $(SPEEX_SONAME): $(MAKE) -f $(RULES_MAK) APP=SPEEX app=libspeex $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) clean print_lib: -- cgit v1.2.3