[svn-commits] branch jcollie/sounds-install r36196 - /team/jcollie/sounds-install/sounds/

[svn-commits at lists.digium.com]

Author: jcollie
Date: Wed Jun 28 13:49:41 2006
New Revision: 36196

URL: http://svn.digium.com/view/asterisk?rev=36196&view=rev
Log:
Changes to how sounds get installed.

Modified:
    team/jcollie/sounds-install/sounds/Makefile

Modified: team/jcollie/sounds-install/sounds/Makefile
URL: http://svn.digium.com/view/asterisk/team/jcollie/sounds-install/sounds/Makefile?rev=36196&r1=36195&r2=36196&view=diff
==============================================================================
--- team/jcollie/sounds-install/sounds/Makefile (original)
+++ team/jcollie/sounds-install/sounds/Makefile Wed Jun 28 13:49:41 2006
@@ -21,6 +21,7 @@
 SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
 MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
 CORE_SOUNDS_VERSION:=1.4.0
+EXTRA_SOUNDS_VERSION:=1.4.0
 SOUNDS_URL:=http://ftp.digium.com/pub/telephony/sounds/releases
 MOH_URL:=http://ftp.digium.com/pub/telephony/sounds
 MENUSELECT_CORE_SOUNDS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
@@ -42,6 +43,7 @@
 MENUSELECT_EXTRA_SOUNDS:=$(subst -GSM,-gsm,$(MENUSELECT_EXTRA_SOUNDS))
 MENUSELECT_EXTRA_SOUNDS:=$(subst -G729,-g729,$(MENUSELECT_EXTRA_SOUNDS))
 EXTRA_SOUNDS:=$(MENUSELECT_EXTRA_SOUNDS:EXTRA-SOUNDS-%=asterisk-extra-sounds-%.tar.gz)
+EXTRA_SOUND_TAGS:=$(MENUSELECT_EXTRA_SOUNDS:EXTRA-SOUNDS-%=$(SOUNDS_DIR)/.asterisk-extra-sounds-%-$(EXTRA_SOUNDS_VERSION))
 MENUSELECT_MOH:=$(subst -FREEPLAY-,-freeplay-,$(MENUSELECT_MOH))
 MENUSELECT_MOH:=$(subst -WAV,-wav,$(MENUSELECT_MOH))
 MENUSELECT_MOH:=$(subst -ULAW,-ulaw,$(MENUSELECT_MOH))
@@ -52,37 +54,22 @@
 MOH_TAGS:=$(MENUSELECT_MOH:MOH-%=$(MOH_DIR)/.asterisk-moh-%)
 WGET_ARGS:=--continue
 
-all:	$(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
+all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
 
-$(SOUNDS_DIR)/.asterisk-core-sounds-en-%:
-	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
-	if ! test -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
-	if ! test -f $${PACKAGE}; then exit 1; fi; \
-	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
-	(cd $(SOUNDS_DIR); tar xzf $(PWD)/$${PACKAGE}) && \
+$(SOUNDS_DIR)/.asterisk-core-sounds-en-%: asterisk-core-sounds-en-%.tar.gz $(SOUNDS_DIR)
+	tar xzCf $(SOUNDS_DIR) $<
 	touch $@
 
-$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: $(SOUNDS_DIR)/fr
-	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
-	if ! test -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
-	if ! test -f $${PACKAGE}; then exit 1; fi; \
-	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
-	(cd $(SOUNDS_DIR)/fr; tar xzf $(PWD)/$${PACKAGE}) && \
+$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: asterisk-core-sounds-fr-%.tar.gz $(SOUNDS_DIR)/fr
+	tar xzCf $(SOUNDS_DIR)/fr $<
 	touch $@
 
-$(SOUNDS_DIR)/.asterisk-core-sounds-fr-%: $(SOUNDS_DIR)/es
-	@PACKAGE=$(subst $(SOUNDS_DIR)/.asterisk,asterisk,$@).tar.gz; \
-	if ! test -f $${PACKAGE}; then wget $(WGET_ARGS) $(SOUNDS_URL)/$${PACKAGE}; fi; \
-	if ! test -f $${PACKAGE}; then exit 1; fi; \
-	rm -f $(subst -$(CORE_SOUNDS_VERSION),,$@)-* && \
-	(cd $(SOUNDS_DIR)/es; tar xzf $(PWD)/$${PACKAGE}) && \
+$(SOUNDS_DIR)/.asterisk-core-sounds-es-%: asterisk-core-sounds-es-%.tar.gz $(SOUNDS_DIR)/es
+	tar xzCf $(SOUNDS_DIR)/es $<
 	touch $@
 
-$(MOH_DIR)/.asterisk-moh-%:
-	@PACKAGE=$(subst $(MOH_DIR)/.asterisk,asterisk,$@).tar.gz; \
-	if ! test -f $${PACKAGE}; then wget $(WGET_ARGS) $(MOH_URL)/$${PACKAGE}; fi; \
-	if ! test -f $${PACKAGE}; then exit 1; fi; \
-	(cd $(MOH_DIR); tar xzf $(PWD)/$${PACKAGE}) && \
+$(MOH_DIR)/.asterisk-moh-%: asterisk-moh-%.tar.gz $(MOH_DIR)
+	tar xzCf $(MOH_DIR) $<
 	touch $@
 
 asterisk-core-%.tar.gz:
@@ -97,10 +84,12 @@
 dist-clean:
 	rm -f *.tar.gz
 
-$(SOUNDS_DIR) $(MOH_DIR) $(SOUNDS_DIR)/%:
+.PHONY: $(SOUNDS_DIR) $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/es $(MOH_DIR)
+
+$(SOUNDS_DIR) $(SOUNDS_DIR)/fr $(SOUNDS_DIR)/es $(MOH_DIR):
 	mkdir -p $@
 
-install: $(SOUNDS_DIR) $(MOH_DIR) $(CORE_SOUND_TAGS) $(MOH_TAGS)
+install: $(CORE_SOUND_TAGS) $(EXTRA_SOUND_TAGS) $(MOH_TAGS)
 
 uninstall:
 	rm -rf $(SOUNDS_DIR)