aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-25 08:50:14 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-25 08:50:14 +0000
commit673e53a3284ef7c6806d87e49e4d0f965cdb8ac3 (patch)
tree3fc3454bb74e9929acf22941fad43ac3db5d9a02 /Makefile
parentf2629806ef24b406c5fd3d2b2c4d7e2359d6e0c4 (diff)
use new (separate) dependencies file from menuselect
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35895 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7af2cca9b..59e606329 100644
--- a/Makefile
+++ b/Makefile
@@ -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)