diff options
author | Jason Parker <jparker@digium.com> | 2013-02-15 12:54:17 -0600 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:43:43 -0500 |
commit | 36194f13ae01a7f5578104fcb7e022fe81c83464 (patch) | |
tree | 8a24e9a6859e5f12e64393ad5ab293d8fda8223b /third_party/build/gsm | |
parent | 71174079bbdbf51e3f232d2591b3ab6b6d75c6f8 (diff) |
More fixes for dependencies, and to be more consistent.
Diffstat (limited to 'third_party/build/gsm')
-rw-r--r-- | third_party/build/gsm/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/third_party/build/gsm/Makefile b/third_party/build/gsm/Makefile index 1fba80e..0b94998 100644 --- a/third_party/build/gsm/Makefile +++ b/third_party/build/gsm/Makefile @@ -5,9 +5,13 @@ export LIBDIR := ../../lib RULES_MAK := $(PJDIR)/build/rules.mak +export GSM_CODEC_LIB := libgsmcodec-$(TARGET_NAME)$(LIBEXT) + +ifeq ($(PJ_SHARED_LIBRARIES),) +else export GSM_CODEC_SONAME := libgsmcodec.$(SHLIB_SUFFIX) export GSM_CODEC_SHLIB := $(GSM_CODEC_SONAME).$(PJ_VERSION_MAJOR) -export GSM_CODEC_LIB := libgsmcodec-$(TARGET_NAME)$(LIBEXT) +endif ############################################################################### # Gather all flags. @@ -37,10 +41,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 := $(GSM_CODEC_LIB) -ifneq ($(PJ_SHARED_LIBRARIES),) -TARGETS += $(GSM_CODEC_SONAME) -endif +TARGETS := $(GSM_CODEC_LIB) $(GSM_CODEC_SONAME) all: $(TARGETS) @@ -52,12 +53,11 @@ distclean: realclean .PHONY: all dep depend clean realclean distclean .PHONY: $(TARGETS) -.PHONE: $(GSM_CODEC_LIB) $(GSM_CODEC_SHLIB) $(GSM_CODEC_SONAME) +.PHONE: $(GSM_CODEC_LIB) $(GSM_CODEC_SONAME) libgsmcodec: $(GSM_CODEC_LIB) -$(GSM_CODEC_SHLIB): $(GSM_CODEC_SONAME) $(GSM_CODEC_SONAME): $(GSM_CODEC_LIB) -$(GSM_CODEC_LIB) $(GSM_CODEC_SHLIB) $(GSM_CODEC_SONAME): +$(GSM_CODEC_LIB) $(GSM_CODEC_SONAME): $(MAKE) -f $(RULES_MAK) APP=GSM_CODEC app=libgsmcodec $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) clean print_lib: |