[svn-commits] rmudgett: trunk r373636 - in /trunk: ./ codecs/Makefile

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Sep 25 12:02:21 2012
New Revision: 373636

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=373636
Log:
Make rebuild GSM, ilbc, or lpc10 codecs if the respective sources change.
........

Merged revisions 373618 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 373633 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 373635 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/codecs/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/codecs/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/codecs/Makefile?view=diff&rev=373636&r1=373635&r2=373636
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Tue Sep 25 12:02:21 2012
@@ -17,47 +17,74 @@
 MENUSELECT_CATEGORY=CODECS
 MENUSELECT_DESCRIPTION=Codec Translators
 
-LIBILBC:=ilbc/libilbc.a
-LIBLPC10:=lpc10/liblpc10.a
+SUB_GSM := gsm
+
+SUB_ILBC := ilbc
+LIBILBC := $(SUB_ILBC)/libilbc.a
+
+SUB_LPC10 := lpc10
+LIBLPC10 := $(SUB_LPC10)/liblpc10.a
+
+SUB_DIRS := \
+	$(SUB_GSM) \
+	$(SUB_ILBC) \
+	$(SUB_LPC10) \
 
 all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
+
 ifneq ($(GSM_INTERNAL),no)
-GSM_INCLUDE:=-Igsm/inc
-$(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): gsm/lib/libgsm.a
+GSM_INCLUDE := -I$(SUB_GSM)/inc
+
+$(if $(filter codec_gsm,$(EMBEDDED_MODS)),modules.link,codec_gsm.so): $(SUB_GSM)/lib/libgsm.a
 endif
+
+# Don't run the implicit rules for this target.
+$(SUB_GSM)/lib/libgsm.a: $(SUB_GSM) ;
+
+$(SUB_GSM):
+	@mkdir -p $(SUB_GSM)/lib
+	@$(MAKE) -C $(SUB_GSM) lib/libgsm.a
+
+
+clean::
+	for dir in $(SUB_DIRS); do \
+		$(MAKE) -C $$dir clean; \
+	done
+	rm -f g722/*.[oa]
+	rm -f speex/*.[oa]
+
+.PHONY: $(SUB_DIRS)
+
+
+$(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10)
+
+# Don't run the implicit rules for this target.
+$(LIBLPC10): $(SUB_LPC10) ;
+
+$(SUB_LPC10):
+	@$(MAKE) -C $(SUB_LPC10) all
+
 
 ifneq ($(ILBC_INTERNAL),no)
 $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC)
 else
-ILBC_INCLUDE+=-DILBC_WEBRTC
+ILBC_INCLUDE += -DILBC_WEBRTC
 endif
 
+# Don't run the implicit rules for this target.
+$(LIBILBC): $(SUB_ILBC) ;
 
-clean::
-	$(MAKE) -C gsm clean
-	$(MAKE) -C lpc10 clean
-	$(MAKE) -C ilbc clean
-	rm -f g722/*.[oa]
-	rm -f speex/*.[oa]
-
-gsm/lib/libgsm.a:
-	@mkdir -p gsm/lib
-	@$(MAKE) -C gsm lib/libgsm.a
-
-$(LIBLPC10):
-	@$(MAKE) -C lpc10 all
-
-$(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10)
-
-$(LIBILBC):
-	@$(MAKE) -C ilbc all _ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(_ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)"
+$(SUB_ILBC):
+	@$(MAKE) -C $(SUB_ILBC) all _ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(_ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)"
 
 
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): g722/g722_encode.o g722/g722_decode.o
+
 g722/g722_encode.o g722/g722_decode.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,codec_g722)
+
 
 ifeq ($(BUILD_CPU),x86_64)
 SPEEX_RESAMPLE_CFLAGS:=-fPIC
@@ -66,4 +93,5 @@
 endif
 
 $(if $(filter codec_resample,$(EMBEDDED_MODS)),modules.link,codec_resample.so): speex/resample.o
+
 speex/resample.o: _ASTCFLAGS+=$(call MOD_ASTCFLAGS,codec_resample) $(SPEEX_RESAMPLE_CFLAGS)