diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | apps/Makefile | 1 | ||||
| -rw-r--r-- | cdr/Makefile | 1 | ||||
| -rw-r--r-- | channels/Makefile | 1 | ||||
| -rw-r--r-- | codecs/Makefile | 3 | ||||
| -rw-r--r-- | formats/Makefile | 1 | ||||
| -rw-r--r-- | funcs/Makefile | 1 | ||||
| -rw-r--r-- | pbx/Makefile | 1 | ||||
| -rw-r--r-- | res/Makefile | 1 | ||||
| -rw-r--r-- | sounds/Makefile | 4 |
10 files changed, 12 insertions, 6 deletions
@@ -121,6 +121,7 @@ USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts) ifneq ($(wildcard menuselect.makeopts),) include menuselect.makeopts + include menuselect.makedeps endif ifneq ($(wildcard makeopts),) @@ -512,7 +513,7 @@ dist-clean: clean @$(MAKE) -C mxml clean @$(MAKE) -C menuselect dist-clean @$(MAKE) -C sounds dist-clean - rm -f menuselect.makeopts makeopts makeopts.xml + rm -f menuselect.makeopts makeopts makeopts.xml menuselect.makedeps rm -f config.log config.status rm -rf autom4te.cache rm -f include/autoconfig.h @@ -885,6 +886,5 @@ mxml/libmxml.a: makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml @echo "Generating list of available modules ..." @build_tools/prep_moduledeps > $@ - @sed -i -e /MENUSELECT_DEPENDS/d menuselect.makeopts .PHONY: menuselect sounds clean clean-depend dist-clean distclean all _all depend cleantest uninstall _uninstall uninstall-all dont-optimize valgrind $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_CLEAN_DEPEND) $(SUBDIRS_DEPEND) $(SUBDIRS_UNINSTALL) $(SUBDIRS) diff --git a/apps/Makefile b/apps/Makefile index 01d70c6af..7c86dfa32 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -11,6 +11,7 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c))) diff --git a/cdr/Makefile b/cdr/Makefile index 5b1f5071b..1e7791269 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -11,6 +11,7 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c))) diff --git a/channels/Makefile b/channels/Makefile index e65ce1256..5af2f3c02 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -11,6 +11,7 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c))) diff --git a/codecs/Makefile b/codecs/Makefile index df84f3b5e..61c551078 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -11,10 +11,9 @@ # the GNU General Public License # -.PHONY: clean clean-depend all depend uninstall - ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c))) diff --git a/formats/Makefile b/formats/Makefile index 351f1e8a1..06195d03c 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -11,6 +11,7 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c))) diff --git a/funcs/Makefile b/funcs/Makefile index 381a3d72c..5a8845c18 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -11,6 +11,7 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c))) diff --git a/pbx/Makefile b/pbx/Makefile index 6b9beb970..7680943cb 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -11,6 +11,7 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c))) diff --git a/res/Makefile b/res/Makefile index 3fc5a406b..de6e90ac6 100644 --- a/res/Makefile +++ b/res/Makefile @@ -11,6 +11,7 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makeopts + include ../menuselect.makedeps endif SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c))) diff --git a/sounds/Makefile b/sounds/Makefile index 7a5d60d04..a55b765d4 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -52,6 +52,8 @@ MOH:=$(MENUSELECT_MOH:MOH-%=asterisk-moh-%.tar.gz) MOH_TAGS:=$(MENUSELECT_MOH:MOH-%=$(MOH_DIR)/.asterisk-moh-%) WGET_ARGS:=--continue +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; \ @@ -92,8 +94,6 @@ asterisk-extra-%.tar.gz: asterisk-moh-%.tar.gz: @wget $(WGET_ARGS) $(MOH_URL)/$@ -all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH) - dist-clean: rm -f *.tar.gz |