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/g7221/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'third_party/build/g7221/Makefile') diff --git a/third_party/build/g7221/Makefile b/third_party/build/g7221/Makefile index 59d8160..d0e7596 100644 --- a/third_party/build/g7221/Makefile +++ b/third_party/build/g7221/Makefile @@ -5,9 +5,13 @@ export LIBDIR := ../../lib RULES_MAK := $(PJDIR)/build/rules.mak +export G7221_CODEC_LIB := libg7221codec-$(TARGET_NAME)$(LIBEXT) + +ifeq ($(PJ_SHARED_LIBRARIES),) +else export G7221_CODEC_SONAME := libg7221codec.$(SHLIB_SUFFIX) export G7221_CODEC_SHLIB := $(G7221_CODEC_SONAME).$(PJ_VERSION_MAJOR) -export G7221_CODEC_LIB := libg7221codec-$(TARGET_NAME)$(LIBEXT) +endif ############################################################################### # Gather all flags. @@ -36,10 +40,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 := $(G7221_CODEC_LIB) -ifneq ($(PJ_SHARED_LIBRARIES),) -TARGETS += $(G7221_CODEC_SONAME) -endif +TARGETS := $(G7221_CODEC_LIB) $(G7221_CODEC_SONAME) all: $(TARGETS) @@ -51,12 +52,11 @@ distclean: realclean .PHONY: all dep depend clean realclean distclean .PHONY: $(TARGETS) -.PHONY: $(G7221_CODEC_LIB) $(G7221_CODEC_SHLIB) $(G7221_CODEC_SONAME) +.PHONY: $(G7221_CODEC_LIB) $(G7221_CODEC_SONAME) libg7221codec: $(G7221_CODEC_LIB) -$(G7221_CODEC_SHLIB): $(G7221_CODEC_SONAME) $(G7221_CODEC_SONAME): $(G7221_CODEC_LIB) -$(G7221_CODEC_LIB) $(G7221_CODEC_SHLIB) $(G7221_CODEC_SONAME): +$(G7221_CODEC_LIB) $(G7221_CODEC_SONAME): $(MAKE) -f $(RULES_MAK) APP=G7221_CODEC app=libg7221codec $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) clean print_lib: -- cgit v1.2.3