[svn-commits] tzafrir: branch tzafrir/makefile r1430 - /team/tzafrir/makefile/Makefile

[svn-commits at lists.digium.com]

Author: tzafrir
Date: Thu Sep  7 14:55:38 2006
New Revision: 1430

URL: http://svn.digium.com/view/zaptel?rev=1430&view=rev
Log:
* 'make all' should not depend on the menuselect target.
* menuselect should be run manually: (to allow running it more than once).
  Thus renaming the target to "menuconfig" (a phony target).
* make should not run configure on its own:
  - Allow passing CFLAGS and other vars to ./configure .
  - Allow passing custom arguments to ./configure .

Modified:
    team/tzafrir/makefile/Makefile

Modified: team/tzafrir/makefile/Makefile
URL: http://svn.digium.com/view/zaptel/team/tzafrir/makefile/Makefile?rev=1430&r1=1429&r2=1430&view=diff
==============================================================================
--- team/tzafrir/makefile/Makefile (original)
+++ team/tzafrir/makefile/Makefile Thu Sep  7 14:55:38 2006
@@ -7,7 +7,7 @@
 
 .EXPORT_ALL_VARIABLES:
 
-.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs
+.PHONY: menuselect distclean dist-clean clean version.h all _all install b410p devices programs modules linux24 linux26 xpp tests devel data stackcheck install-udev config update install-programs install-modules install-linux24 install-linux26 firmware install-include install-libs menuonfig
 
 HOSTCC=gcc
 CC=gcc
@@ -183,7 +183,7 @@
 UTILSO:=$(UTILS:%=%.o)
 BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
 
-all: menuselect.makeopts 
+all: 
 	@$(MAKE) _all
 
 _all: $(if $(MODULES),modules) programs $(LTZ_SO) $(LTZ_A)
@@ -515,14 +515,14 @@
 	rm -f config.log config.status
 
 config.status: configure
-	@CFLAGS="" ./configure
 	@echo "****"
-	@echo "**** The configure script was just executed, so 'make' needs to be"
-	@echo "**** restarted."
+	@echo "**** Please run ./configure and then re-run 'make'."
 	@echo "****"
 	@exit 1
 
-menuselect.makeopts: menuselect/menuselect menuselect-tree
+# this rule generates menuselect.makeopts. However there is no point in 
+# making it a dependency, as menuselect.makeopts is optional
+menuconfig: menuselect/menuselect menuselect-tree
 	@menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
 
 menuselect: menuselect/menuselect menuselect-tree