More fixes for dependencies, and to be more consistent.

8 files changed, 64 insertions, 63 deletions

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:
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:
diff --git a/third_party/build/ilbc/Makefile b/third_party/build/ilbc/Makefile
index 1e75d07..39ac6b2 100644
--- a/third_party/build/ilbc/Makefile
+++ b/third_party/build/ilbc/Makefile
@@ -5,9 +5,13 @@ export LIBDIR := ../../lib
 
 RULES_MAK := $(PJDIR)/build/rules.mak
 
+export ILBC_LIB := libilbccodec-$(TARGET_NAME)$(LIBEXT)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+else
 export ILBC_SONAME := libilbccodec.$(SHLIB_SUFFIX)
 export ILBC_SHLIB := $(ILBC_SONAME).$(PJ_VERSION_MAJOR)
-export ILBC_LIB := libilbccodec-$(TARGET_NAME)$(LIBEXT)
+endif
 
 ###############################################################################
 # Gather all flags.
@@ -38,10 +42,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 := $(ILBC_LIB)
-ifneq ($(PJ_SHARED_LIBRARIES),)
-TARGETS += $(ILBC_SONAME)
-endif
+TARGETS := $(ILBC_LIB) $(ILBC_SONAME)
 
 all: $(TARGETS)
 
@@ -53,12 +54,11 @@ distclean: realclean
 
 .PHONY: all dep depend clean realclean distclean
 .PHONY: $(TARGETS)
-.PHONY: $(ILBC_LIB) $(ILBC_SHLIB) $(ILBC_SONAME)
+.PHONY: $(ILBC_LIB) $(ILBC_SONAME)
 
 libilbccodec: $(ILBC_LIB)
-$(ILBC_SHLIB): $(ILBC_SONAME)
 $(ILBC_SONAME): $(ILBC_LIB)
-$(ILBC_LIB) $(ILBC_SHLIB) $(ILBC_SONAME):
+$(ILBC_LIB) $(ILBC_SONAME):
 	$(MAKE) -f $(RULES_MAK) APP=ILBC app=libilbccodec $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 clean print_lib:
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:
diff --git a/third_party/build/portaudio/Makefile b/third_party/build/portaudio/Makefile
index 6c36747..a5c2449 100644
--- a/third_party/build/portaudio/Makefile
+++ b/third_party/build/portaudio/Makefile
@@ -6,9 +6,13 @@ export LIBDIR := ../../lib
 
 RULES_MAK := $(PJDIR)/build/rules.mak
 
+export PORTAUDIO_LIB:=libportaudio-$(TARGET_NAME)$(LIBEXT)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+else
 export PORTAUDIO_SONAME := libportaudio.$(SHLIB_SUFFIX)
 export PORTAUDIO_SHLIB := $(PORTAUDIO_SONAME).$(PJ_VERSION_MAJOR)
-export PORTAUDIO_LIB:=libportaudio-$(TARGET_NAME)$(LIBEXT)
+endif
 
 PORTAUDIO_OBJS += pa_allocation.o \
 		  pa_converters.o \
@@ -45,10 +49,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 := $(PORTAUDIO_LIB)
-ifneq ($(PJ_SHARED_LIBRARIES),)
-TARGETS += $(PORTAUDIO_SONAME)
-endif
+TARGETS := $(PORTAUDIO_LIB) $(PORTAUDIO_SONAME)
 
 all: $(TARGETS)
 
@@ -57,12 +58,11 @@ distclean: realclean
 
 .PHONY: all dep depend clean realclean distclean
 .PHONY: $(TARGETS)
-.PHONY: $(PORTAUDIO_LIB) $(PORTAUDIO_SHLIB) $(PORTAUDIO_SONAME)
+.PHONY: $(PORTAUDIO_LIB) $(PORTAUDIO_SONAME)
 
 libportaudio: $(PORTAUDIO_LIB)
-$(PORTAUDIO_SHLIB): $(PORTAUDIO_SONAME)
 $(PORTAUDIO_SONAME): $(PORTAUDIO_LIB)
-$(PORTAUDIO_LIB) $(PORTAUDIO_SHLIB) $(PORTAUDIO_SONAME):
+$(PORTAUDIO_LIB) $(PORTAUDIO_SONAME):
 	$(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 clean:
diff --git a/third_party/build/resample/Makefile b/third_party/build/resample/Makefile
index 8b0423e..72ba28a 100644
--- a/third_party/build/resample/Makefile
+++ b/third_party/build/resample/Makefile
@@ -21,9 +21,13 @@ export RESAMPLE_SRCDIR = ../../resample/src
 export RESAMPLE_OBJS = resamplesubs.o
 export RESAMPLE_CFLAGS = $(_CFLAGS)
 
+export RESAMPLE_LIB := libresample-$(TARGET_NAME)$(LIBEXT)
+
+ifeq ($(PJ_SHARED_LIBRARIES),)
+else
 export RESAMPLE_SONAME := libresample.$(SHLIB_SUFFIX)
 export RESAMPLE_SHLIB := $(RESAMPLE_SONAME).$(PJ_VERSION_MAJOR)
-export RESAMPLE_LIB := libresample-$(TARGET_NAME)$(LIBEXT)
+endif
 
 export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT 
 ###############################################################################
@@ -31,12 +35,10 @@ 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 := $(RESAMPLE_LIB)
+TARGETS := $(RESAMPLE_LIB) $(RESAMPLE_SONAME)
 ifneq ($(PJ_SHARED_LIBRARIES),)
-TARGETS += $(RESAMPLE_SONAME)
 else
 ifneq ($(PJ_RESAMPLE_DLL),)
-TARGETS += $(RESAMPLE_SONAME)
 export RESAMPLE_CFLAGS := -fPIC $(RESAMPLE_CFLAGS)
 endif
 endif
@@ -51,14 +53,13 @@ distclean: realclean
 
 .PHONY: all dep depend clean realclean distclean
 .PHONY: $(TARGETS)
-.PHONY: $(RESAMPLE_LIB) $(RESAMPLE_SHLIB) $(RESAMPLE_SONAME)
+.PHONY: $(RESAMPLE_LIB) $(RESAMPLE_SONAME)
 
 dep: depend
 
 libresample: $(RESAMPLE_LIB)
-$(RESAMPLE_SHLIB): $(RESAMPLE_SONAME)
 $(RESAMPLE_SONAME): $(RESAMPLE_LIB)
-$(RESAMPLE_LIB) $(RESAMPLE_SHLIB) $(RESAMPLE_SONAME):
+$(RESAMPLE_LIB) $(RESAMPLE_SONAME):
 	$(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
 clean print_lib:
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:
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: