[asterisk-commits] branch group/autoconf_and_menuselect r18438 - in /team/group/autoconf_and_men...

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Apr  7 17:11:34 2006
New Revision: 18438

URL: http://svn.digium.com/view/asterisk?rev=18438&view=rev
Log:
clean up Makefile dependencies and add dist-clean target

Modified:
    team/group/autoconf_and_menuselect/Makefile
    team/group/autoconf_and_menuselect/build_tools/Makefile

Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=18438&r1=18437&r2=18438&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Fri Apr  7 17:11:34 2006
@@ -443,7 +443,7 @@
 
 CFLAGS+=-DT38_SUPPORT
 
-_all: menuselect-deps all
+_all: all
 	@echo " +--------- Asterisk Build Complete ---------+"  
 	@echo " + Asterisk has successfully been built, but +"  
 	@echo " + cannot be run before being installed by   +"  
@@ -452,11 +452,14 @@
 	@echo " +               $(MAKE) install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest depend asterisk subdirs 
-
-menuselect-deps: _menuselect makeopts.xml
-	@test -f build_tools/menuselect-deps || ( echo "You must run ./configure before building Asterisk!" && exit 1 )
-	@./build_tools/menuselect --check-deps
+all: cleantest include/autoconfig.h menuselect.makeopts depend asterisk subdirs
+
+include/autoconfig.h:
+	@echo "You must run ./configure before building Asterisk!"
+	@exit 1
+
+menuselect.makeopts: build_tools/menuselect makeopts.xml
+	@build_tools/menuselect --check-deps
 
 #ifneq ($(wildcard tags),)
 ctags: tags
@@ -569,11 +572,18 @@
 	$(MAKE) -C db1-ast clean
 	$(MAKE) -C stdtime clean
 
+dist-clean: clean
+	rm -f menuselect.makeopts makeopts makeopts.xml
+	rm -f config.log config.status
+	rm -f include/autoconfig.h
+	$(MAKE) -C mxml clean
+	$(MAKE) -C build_tools dist-clean
+
 datafiles: all
 	if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
-	# Should static HTTP be installed during make samples or even with its own target ala
-	# webvoicemail?  There are portions here that *could* be customized but might also be
-	# improved a lot.  I'll put it here for now.
+# Should static HTTP be installed during make samples or even with its own target ala
+# webvoicemail?  There are portions here that *could* be customized but might also be
+# improved a lot.  I'll put it here for now.
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/static-http
 	for x in static-http/*; do \
 		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/static-http ; \
@@ -975,16 +985,16 @@
 	rm -rf $(DESTDIR)$(ASTETCDIR)
 	rm -rf $(DESTDIR)$(ASTLOGDIR)
 
-menuselect: mxml/libmxml.a _menuselect makeopts.xml
-	@echo "Running menuselect ... "
-	@./build_tools/menuselect && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
-
-_menuselect:
+menuselect: build_tools/menuselect makeopts.xml
+	- at ./build_tools/menuselect && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+
+build_tools/menuselect: mxml/libmxml.a
 	$(MAKE) -C build_tools menuselect
 
-mxml/libmxml.a: FORCE
+mxml/libmxml.a:
 	@cd mxml && unset CFLAGS && test -f config.h || ./configure
 	$(MAKE) -C mxml libmxml.a
 
-makeopts.xml:
-	@test -f makeopts.xml || ( echo "Generating list of available modules ..." && ./build_tools/prep_moduledeps > makeopts.xml )
+makeopts.xml: */*.c
+	@echo "Generating list of available modules ..."
+	@build_tools/prep_moduledeps > $@

Modified: team/group/autoconf_and_menuselect/build_tools/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/Makefile?rev=18438&r1=18437&r2=18438&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/Makefile (original)
+++ team/group/autoconf_and_menuselect/build_tools/Makefile Fri Apr  7 17:11:34 2006
@@ -6,3 +6,6 @@
 
 clean:
 	rm -f menuselect menuselect.o
+
+dist-clean: clean
+	rm -f menuselect-deps