[Debburn-changes] r474 - cdrkit/trunk

Eduard Bloch blade at alioth.debian.org
Sat Nov 25 16:48:13 CET 2006


Author: blade
Date: 2006-11-25 16:48:13 +0100 (Sat, 25 Nov 2006)
New Revision: 474

Modified:
   cdrkit/trunk/Makefile
Log:
Restored the good Makefile from 1.0 trunk, lost somehow

Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile	2006-11-25 15:44:48 UTC (rev 473)
+++ cdrkit/trunk/Makefile	2006-11-25 15:48:13 UTC (rev 474)
@@ -21,16 +21,8 @@
 	rm */Makefile */*/Makefile
 
 clean:
-#	-cd build && make clean
-#	rm -f include/xconfig.h include/align.h
 	rm -rf build
 
-%: build/Makefile
-ifneq ($(CFLAGS),)
-	cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
-endif
-	$(MAKE) -C build $(MAKE_FLAGS) $@
-
 ifneq ($(PREFIX),)
 install: build/Makefile
 	cd build && cmake .. -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE) $(MAKE_FLAGS) install
@@ -47,4 +39,9 @@
 	rm -rf tmp
 	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
+ifneq ($(CFLAGS),)
+	cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
+endif
+	$(MAKE) -C build $(MAKE_FLAGS) $@




More information about the Debburn-changes mailing list