[Debburn-changes] r264 - nonameyet/trunk

[Eduard Bloch]

Author: blade
Date: 2006-09-11 22:11:27 +0000 (Mon, 11 Sep 2006)
New Revision: 264

Modified:
   nonameyet/trunk/Makefile
Log:
Made CFLAGS be passed to all wrapping targets

Modified: nonameyet/trunk/Makefile
===================================================================
--- nonameyet/trunk/Makefile	2006-09-11 22:01:55 UTC (rev 263)
+++ nonameyet/trunk/Makefile	2006-09-11 22:11:27 UTC (rev 264)
@@ -1,16 +1,18 @@
 
+all: build/Makefile
 ifneq ($(CFLAGS),)
-EXTRA_CMAKE_FLAGS += -DCMAKE_C_FLAGS="$(CFLAGS)"
+	cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
 endif
-
-all: build/Makefile
 	$(MAKE) -C build $(MAKE_FLAGS) all
 
 DISTNAME=cdrkit-$(shell cat VERSION)
 
 build/Makefile:
 	@-mkdir build 2>/dev/null
-	cd build && cmake .. $(EXTRA_CMAKE_FLAGS)
+	cd build && cmake ..
+ifneq ($(CFLAGS),)
+	cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
+endif
 
 cmakepurge:
 	rm -rf install_manifest.txt progress.make CMakeFiles CMakeCache.txt cmake_install.cmake 
@@ -24,6 +26,9 @@
 	rm -rf build
 
 %: build/Makefile
+ifneq ($(CFLAGS),)
+	cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
+endif
 	$(MAKE) -C build $(MAKE_FLAGS) $@
 
 ifneq ($(PREFIX),)