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/srtp/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'third_party/build/srtp') diff --git a/third_party/build/srtp/Makefile b/third_party/build/srtp/Makefile index 4ed0121..9538f0b 100644 --- a/third_party/build/srtp/Makefile +++ b/third_party/build/srtp/Makefile @@ -5,9 +5,13 @@ export LIBDIR := ../../lib RULES_MAK := $(PJDIR)/build/rules.mak +export SRTP_LIB := libsrtp-$(TARGET_NAME)$(LIBEXT) + +ifeq ($(PJ_SHARED_LIBRARIES),) +else export SRTP_SONAME := libsrtp.$(SHLIB_SUFFIX) export SRTP_SHLIB := $(SRTP_SONAME).$(PJ_VERSION_MAJOR) -export SRTP_LIB := libsrtp-$(TARGET_NAME)$(LIBEXT) +endif ############################################################################### # Gather all flags. @@ -59,10 +63,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 := $(SRTP_LIB) -ifneq ($(PJ_SHARED_LIBRARIES),) -TARGETS += $(SRTP_SONAME) -endif +TARGETS := $(SRTP_LIB) $(SRTP_SONAME) all: $(TARGETS) @@ -74,12 +75,11 @@ distclean: realclean .PHONY: all dep depend clean realclean distclean .PHONY: $(TARGETS) -.PHONY: $(SRTP_LIB) $(SRTP_SHLIB) $(SRTP_SONAME) +.PHONY: $(SRTP_LIB) $(SRTP_SONAME) libsrtp: $(SRTP_LIB) -$(SRTP_SHLIB): $(SRTP_SONAME) $(SRTP_SONAME): $(SRTP_LIB) -$(SRTP_LIB) $(SRTP_SHLIB) $(SRTP_SONAME): +$(SRTP_LIB) $(SRTP_SONAME): $(MAKE) -f $(RULES_MAK) APP=SRTP app=libsrtp $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) clean print_lib: -- cgit v1.2.3