Alexandre Julliard : makedep: Use a string array to manage dlldata source files.
Alexandre Julliard
julliard at winehq.org
Fri Dec 27 13:31:09 CST 2013
Module: wine
Branch: master
Commit: 708d6d3ae884e8559bea1d1a65cb2406797df980
URL: http://source.winehq.org/git/wine.git/?a=commit;h=708d6d3ae884e8559bea1d1a65cb2406797df980
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Dec 27 14:26:37 2013 +0100
makedep: Use a string array to manage dlldata source files.
---
tools/makedep.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index 2a7a4a6..fc9b1b5 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1358,6 +1358,7 @@ static struct strarray output_sources(void)
struct strarray po_files = empty_strarray;
struct strarray mc_files = empty_strarray;
struct strarray test_files = empty_strarray;
+ struct strarray dlldata_files = empty_strarray;
struct strarray includes = empty_strarray;
struct strarray subdirs = empty_strarray;
@@ -1477,6 +1478,7 @@ static struct strarray output_sources(void)
strarray_add( &clean_files, dest );
strarray_add( &targets, dest );
}
+ if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name );
column = 0;
output_filenames( &targets, &column );
output( ": $(WIDL)\n" );
@@ -1596,12 +1598,11 @@ static struct strarray output_sources(void)
strarray_add( &clean_files, "msg.pot" );
}
- if (find_src_file( "dlldata.o" ))
+ if (dlldata_files.count)
{
output( "dlldata.c: $(WIDL) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" );
column = output( "\t$(WIDL) --dlldata-only -o $@" );
- LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry )
- if (source->flags & FLAG_IDL_PROXY) output_filename( source->filename, &column );
+ output_filenames( &dlldata_files, &column );
output( "\n" );
strarray_add( &clean_files, "dlldata.c" );
}
More information about the wine-cvs
mailing list