[Debburn-changes] r546 - cdrkit/trunk

Eduard Bloch blade at alioth.debian.org
Sat Dec 2 13:24:02 CET 2006


Author: blade
Date: 2006-12-02 13:24:02 +0100 (Sat, 02 Dec 2006)
New Revision: 546

Modified:
   cdrkit/trunk/Makefile
Log:
Cruft cleanup in Makefile, set the default target properly

Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile	2006-12-02 12:08:56 UTC (rev 545)
+++ cdrkit/trunk/Makefile	2006-12-02 12:24:02 UTC (rev 546)
@@ -10,19 +10,13 @@
 #CMAKETWEAKS += cmake build  -DCMAKE_INSTALL_PREFIX="$(PREFIX)" || exit 1 ; 
 #endif
 
+default_target: all
 
-all: build/Makefile
-	$(CMAKETWEAKS)
-	$(MAKE) -C build $(MAKE_FLAGS) all
-
 DISTNAME=cdrkit-$(shell cat VERSION)
 
 build/Makefile:
 	@-mkdir build 2>/dev/null
 	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 
@@ -45,7 +39,7 @@
 	test -e /etc/debian_version && ln -f ../$(DISTNAME).tar.gz ../cdrkit_$(shell cat VERSION | sed -e "s,pre,~pre,").orig.tar.gz || true
 
 %::
-	$(MAKE) build/Makefile
+	$(MAKE) $(MAKE_FLAGS) build/Makefile
 	$(CMAKETWEAKS)
 	$(MAKE) -C build $(MAKE_FLAGS) $@
 




More information about the Debburn-changes mailing list