[haiku-commits] r39825 - haiku/trunk/data/develop
- From: philippe.houdoin@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 13 Dec 2010 12:58:16 +0100 (CET)
Author: phoudoin
Date: 2010-12-13 12:58:15 +0100 (Mon, 13 Dec 2010)
New Revision: 39825
Changeset: http://dev.haiku-os.org/changeset/39825
Modified:
haiku/trunk/data/develop/makefile-engine
Log:
Add input rdef location to include dir, otherwise when rc reads from stdin,
no include dir is defined and import commands will failed then.
Modified: haiku/trunk/data/develop/makefile-engine
===================================================================
--- haiku/trunk/data/develop/makefile-engine 2010-12-12 22:21:46 UTC (rev
39824)
+++ haiku/trunk/data/develop/makefile-engine 2010-12-13 11:58:15 UTC (rev
39825)
@@ -153,7 +153,7 @@
LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS),
$(addprefix -I, $(path)))
SYS_INCLUDES += -i-
SYS_INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -i
, $(path)))
-
+
INCLUDES = $(LOC_INCLUDES) $(SYS_INCLUDES)
endif
endif
@@ -272,9 +272,9 @@
# rules to compile resource definition files
$(OBJ_DIR)/%.rsrc : %.rdef
- cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP)
-o "$@" -
+ cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP)
-I $(dir $<) -o "$@" -
$(OBJ_DIR)/%.rsrc : %.RDEF
- cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP)
-o "$@" -
+ cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP)
-I $(dir $<) -o "$@" -
# rules to handle lex/flex and yacc/bison files
Other related posts:
- » [haiku-commits] r39825 - haiku/trunk/data/develop - philippe . houdoin
