From 36194f13ae01a7f5578104fcb7e022fe81c83464 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/milenage/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'third_party/build/milenage/Makefile')

diff --git a/third_party/build/milenage/Makefile b/third_party/build/milenage/Makefile
index 1948d03..18a48b9 100644
--- a/third_party/build/milenage/Makefile
+++ b/third_party/build/milenage/Makefile
@@ -5,9 +5,13 @@ export LIBDIR := ../../lib
 
 RULES_MAK := $(PJDIR)/build/rules.mak
 
+export MILENAGE_LIB := libmilenage-$(TARGET_NAME)$(LIBEXT)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+else
 export MILENAGE_SONAME := libmilenage.$(SHLIB_SUFFIX)
 export MILENAGE_SHLIB := $(MILENAGE_SONAME).$(PJ_VERSION_MAJOR)
-export MILENAGE_LIB := libmilenage-$(TARGET_NAME)$(LIBEXT)
+endif
 
 ###############################################################################
 # Gather all flags.
@@ -31,10 +35,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 := $(MILENAGE_LIB)
-ifneq ($(PJ_SHARED_LIBRARIES),)
-TARGETS += $(MILENAGE_SONAME)
-endif
+TARGETS := $(MILENAGE_LIB) $(MILENAGE_SONAME)
 
 all: $(TARGETS)
 
@@ -46,12 +47,11 @@ distclean: realclean
 
 .PHONY: all dep depend clean realclean distclean
 .PHONY: $(TARGETS)
-.PHONY: $(MILENAGE_LIB) $(MILENAGE_SHLIB) $(MILENAGE_SONAME)
+.PHONY: $(MILENAGE_LIB) $(MILENAGE_SONAME)
 
 libmilenage: $(MILENAGE_LIB)
-$(MILENAGE_SHLIB): $(MILENAGE_SONAME)
 $(MILENAGE_SONAME): $(MILENAGE_LIB)
-$(MILENAGE_LIB) $(MILENAGE_SHLIB) $(MILENAGE_SONAME):
+$(MILENAGE_LIB) $(MILENAGE_SONAME):
 	$(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 clean print_lib:
-- 
cgit v1.2.3