Module: wine Branch: master Commit: 1a74fdbcee3530f4b66590e5f0eebf947ebc9e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74fdbcee3530f4b66590e5f0...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Jan 7 10:56:15 2014 +0100
makefiles: Expand define arguments directly into the generated rules.
---
Make.rules.in | 9 ++++----- tools/makedep.c | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in index 6966144..7e6a09d 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -11,15 +11,14 @@
# First some useful definitions
-DEFS = -D__WINESRC__ $(EXTRADEFS) -ALLCFLAGS = $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) -RCFLAGS = --nostdinc $(PORCFLAGS) $(DEFS) +ALLCFLAGS = $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) +IDLFLAGS = $(EXTRAIDLFLAGS) +RCFLAGS = --nostdinc $(PORCFLAGS)
OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(OBJC_SRCS:.m=.o) \ $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
-ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) +ALLCROSSCFLAGS = $(CPPFLAGS) $(CFLAGS)
# Rules for dependencies
diff --git a/tools/makedep.c b/tools/makedep.c index 28f60fd..4d38613 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -92,6 +92,7 @@ struct strarray static const struct strarray empty_strarray;
static struct strarray include_args; +static struct strarray define_args; static struct strarray make_vars; static struct strarray cmdline_vars;
@@ -1475,9 +1476,10 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res rsrc.pot:", obj ); @@ -1487,9 +1489,10 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res:", obj ); @@ -1524,8 +1527,9 @@ static struct strarray output_sources(void) output_filenames( targets ); output( ": $(WIDL)\n" ); output( "\t$(WIDL) -o $@ %s", source->filename ); - output_filenames( includes ); output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(IDLFLAGS)" ); output( "\n" ); output_filenames( targets ); @@ -1602,6 +1606,7 @@ static struct strarray output_sources(void) output( "%s.o: %s\n", obj, sourcedep ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); + output_filenames( define_args ); if (module || staticlib || testdll) output_filenames( dllflags ); output_filename( "$(ALLCFLAGS)" ); output( "\n" ); @@ -1611,6 +1616,8 @@ static struct strarray output_sources(void) output( "%s.cross.o: %s\n", obj, sourcedep ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); + output_filenames( define_args ); + output_filename( "-DWINE_CROSSTEST" ); output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } @@ -1642,9 +1649,10 @@ static struct strarray output_sources(void) output_filenames( po_files ); output( "\n" ); output( "\t$(WRC) -O pot -o $@" ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output_filenames( po_files ); output( "\n" ); @@ -2090,10 +2098,16 @@ static void update_makefile( const char *path ) parent_dir = get_expanded_make_variable( "PARENTSRC" );
include_args = empty_strarray; + define_args = empty_strarray; + strarray_add( &define_args, "-D__WINESRC__" ); + value = get_expanded_make_var_array( "EXTRAINCL" ); for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) strarray_add_uniq( &include_args, value.str[i] ); + else + strarray_add_uniq( &define_args, value.str[i] ); + strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" ));
init_paths();