From 59ee6d83abecf1b73445facf20ca0017b8b57533 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 1 Jan 2011 17:46:56 +0100 Subject: [PATCH] makefiles: Automatically add missing source variables in make_makefiles. --- dlls/wineps.drv/Makefile.in | 2 +- programs/iexplore/Makefile.in | 2 ++ tools/make_makefiles | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index 71d03de4d6a..e16c7c0fe95 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -63,7 +63,7 @@ C_SRCS = \ type1afm.c \ type42.c -RC_SRCS= \ +RC_SRCS = \ wps_Bg.rc \ wps_Cs.rc \ wps_Da.rc \ diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 921afac68d8..547f8f003ab 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -8,4 +8,6 @@ C_SRCS = \ RC_SRCS = iexplore.rc +SVG_SRCS = iexplore.svg + @MAKE_PROG_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index 5f6ba96979b..673c4cf42c0 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -241,6 +241,7 @@ sub replace_makefile_variable($$) { my ($file, $var) = @_; my $make = $makefiles{$file}; + my $replaced = 0; return unless defined ${$make}{"=$var"}; @@ -252,7 +253,7 @@ sub replace_makefile_variable($$) open OLD_FILE, "$file.in" or die "cannot open $file.in"; while () { - if (/^\s*($var\s+)=/) + if (/^\s*($var\s*)=/) { # try to preserve formatting my $prefix = $1; @@ -270,8 +271,13 @@ sub replace_makefile_variable($$) { print NEW_FILE "$prefix= @values\n"; } + $replaced = 1; next; } + if (/^\@MAKE/ && !$replaced) + { + print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n"; + } print NEW_FILE $_; } close OLD_FILE;