Alexandre Julliard : makefiles: Avoid creating an intermediate rc file for test binaries.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 305aca28b4a6dd800529d68001f21aad42df7f70
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=305aca28b4a6dd800529d68001...

Author: Alexandre Julliard 
Date:   Sun May 22 12:50:10 2011 +0200

makefiles: Avoid creating an intermediate rc file for test binaries.

---

.gitignore                    |    1 -
 aclocal.m4                    |    5 ++---
 configure                     |    5 ++---
 programs/winetest/Makefile.in |    5 ++---
 tools/make_makefiles          |    1 -
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index db020cc..ff9dd9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -265,7 +265,6 @@ programs/winedbg/dbg.tab.c
 programs/winedbg/dbg.tab.h
 programs/winedbg/debug.yy.c
 programs/winetest/*_test.exe
-programs/winetest/*_test.rc
 programs/winetest/build.nfo
 programs/winetest/build.rc
 programs/winhlp32/macro.lex.yy.c
diff --git a/aclocal.m4 b/aclocal.m4
index 6b7788d..bb8a248 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -395,9 +395,8 @@ wine_fn_config_test ()
     wine_fn_append_rule ALL_WINETEST_DEPENDS \
 "$ac_name.exe: $(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT
    cp $(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT $[@] && $(STRIP) $[@]
-$ac_name.rc:
-	echo "$ac_name.exe TESTRES \"$ac_name.exe\"" >$[@] || ($(RM) $[@] && false)
-$ac_name.res: $ac_name.rc $ac_name.exe"
+$ac_name.res: $ac_name.exe
+	echo "$ac_name.exe TESTRES \"$ac_name.exe\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $[@]"
     wine_fn_all_dir_rules $ac_dir Maketest.rules

AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
diff --git a/configure b/configure
index 7bd9dc6..6de7b01 100755
--- a/configure
+++ b/configure
@@ -14861,9 +14861,8 @@ wine_fn_config_test ()
     wine_fn_append_rule ALL_WINETEST_DEPENDS \
 "$ac_name.exe: $(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT
    cp $(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT $@ && $(STRIP) $@
-$ac_name.rc:
-	echo "$ac_name.exe TESTRES \"$ac_name.exe\"" >$@ || ($(RM) $@ && false)
-$ac_name.res: $ac_name.rc $ac_name.exe"
+$ac_name.res: $ac_name.exe
+	echo "$ac_name.exe TESTRES \"$ac_name.exe\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $@"
     wine_fn_all_dir_rules $ac_dir Maketest.rules

if test "x$enable_tests" = xno; then :
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 6d8f9b4..c9a2c71 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -15,13 +15,12 @@ RC_SRCS = \
 SVG_SRCS = winetest.svg

TESTBINS   = @ALL_TEST_BINARIES@
-TESTRCS    = build.rc $(TESTBINS:.exe=.rc)
-EXTRA_OBJS = $(TESTRCS:.rc=.res)
+EXTRA_OBJS = build.res $(TESTBINS:.exe=.res)

@MAKE_PROG_RULES@

clean::
-	$(RM) build.nfo winetest-dist.exe $(TESTBINS) $(TESTRCS)
+	$(RM) build.rc build.nfo winetest-dist.exe $(TESTBINS)

build.rc: dummy
    build="BUILD_INFO STRINGRES build.nfo STRINGTABLE { 1 "`GIT_DIR=$(top_srcdir)/.git git rev-parse HEAD 2>/dev/null`" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1)
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 2c68997..3d50dec 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -99,7 +99,6 @@ my @ignores = (
     "include/stamp-h",
     "msg.pot",
     "programs/winetest/*_test.exe",
-    "programs/winetest/*_test.rc",
     "programs/winetest/build.nfo",
     "programs/winetest/build.rc",
     "rsrc.pot",