[Haiku-commits] r30936 - haiku/trunk/data/develop

[imker at BerliOS]

Author: imker
Date: 2009-06-01 12:26:58 +0200 (Mon, 01 Jun 2009)
New Revision: 30936
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30936&view=rev

Modified:
   haiku/trunk/data/develop/makefile
   haiku/trunk/data/develop/makefile-engine
Log:
 - added preprocessing of RDEF scripts during resource compilation;
 - version of makefile template increased to 2.3 because of adding RDEFS list in previous commit.


Modified: haiku/trunk/data/develop/makefile
===================================================================
--- haiku/trunk/data/develop/makefile	2009-05-31 19:38:25 UTC (rev 30935)
+++ haiku/trunk/data/develop/makefile	2009-06-01 10:26:58 UTC (rev 30936)
@@ -1,4 +1,4 @@
-## BeOS Generic Makefile v2.2 ##
+## BeOS Generic Makefile v2.3 ##
 
 ## Fill in this file to specify the project being created, and the referenced
 ## makefile-engine will do all of the hard work for you.  This handles both

Modified: haiku/trunk/data/develop/makefile-engine
===================================================================
--- haiku/trunk/data/develop/makefile-engine	2009-05-31 19:38:25 UTC (rev 30935)
+++ haiku/trunk/data/develop/makefile-engine	2009-06-01 10:26:58 UTC (rev 30936)
@@ -2,7 +2,7 @@
 ##	Does all the hard work for the Generic Makefile
 ##	which simply defines the project parameters
 
-##	Supports Generic Makefile v2.0, 2.01, 2.1, 2.2
+##	Supports Generic Makefile v2.0, 2.01, 2.1, 2.2, 2.3
 
 #	determine wheather running on x86 or ppc
 MACHINE=$(shell uname -m)
@@ -351,9 +351,9 @@
 
 # rules to compile resource definition files
 $(OBJ_DIR)/%.rsrc : %.rdef
-	$(RESCOMP) -o $@ $<
+	cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o $@ -
 $(OBJ_DIR)/%.rsrc : %.RDEF
-	$(RESCOMP) -o $@ $<
+	cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o $@ -
 
 #	rules to handle lex/flex and yacc/bison files