ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Alexandre Julliard 2011-05-22 12:50:10 +02:00
parent 5d19caf9e5
commit 305aca28b4
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -265,7 +265,6 @@ programs/winedbg/dbg.tab.c
programs/winedbg/dbg.tab.h programs/winedbg/dbg.tab.h
programs/winedbg/debug.yy.c programs/winedbg/debug.yy.c
programs/winetest/*_test.exe programs/winetest/*_test.exe
programs/winetest/*_test.rc
programs/winetest/build.nfo programs/winetest/build.nfo
programs/winetest/build.rc programs/winetest/build.rc
programs/winhlp32/macro.lex.yy.c programs/winhlp32/macro.lex.yy.c

5
aclocal.m4 vendored
View File

@ -395,9 +395,8 @@ wine_fn_config_test ()
wine_fn_append_rule ALL_WINETEST_DEPENDS \ wine_fn_append_rule ALL_WINETEST_DEPENDS \
"$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT "$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT
cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@] cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@]
$ac_name.rc: $ac_name.res: $ac_name.exe
echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false) echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$[@]"
$ac_name.res: $ac_name.rc $ac_name.exe"
wine_fn_all_dir_rules $ac_dir Maketest.rules wine_fn_all_dir_rules $ac_dir Maketest.rules
AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \

5
configure vendored
View File

@ -14861,9 +14861,8 @@ wine_fn_config_test ()
wine_fn_append_rule ALL_WINETEST_DEPENDS \ wine_fn_append_rule ALL_WINETEST_DEPENDS \
"$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT "$ac_name.exe: \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT
cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@ cp \$(top_builddir)/$ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@
$ac_name.rc: $ac_name.res: $ac_name.exe
echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" >\$@ || (\$(RM) \$@ && false) echo \"$ac_name.exe TESTRES \\\"$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$@"
$ac_name.res: $ac_name.rc $ac_name.exe"
wine_fn_all_dir_rules $ac_dir Maketest.rules wine_fn_all_dir_rules $ac_dir Maketest.rules
if test "x$enable_tests" = xno; then : if test "x$enable_tests" = xno; then :

5
programs/winetest/Makefile.in
View File

@ -15,13 +15,12 @@ RC_SRCS = \
SVG_SRCS = winetest.svg SVG_SRCS = winetest.svg
TESTBINS = @ALL_TEST_BINARIES@ TESTBINS = @ALL_TEST_BINARIES@
TESTRCS = build.rc $(TESTBINS:.exe=.rc) EXTRA_OBJS = build.res $(TESTBINS:.exe=.res)
EXTRA_OBJS = $(TESTRCS:.rc=.res)
@MAKE_PROG_RULES@ @MAKE_PROG_RULES@
clean:: clean::
$(RM) build.nfo winetest-dist.exe $(TESTBINS) $(TESTRCS) $(RM) build.rc build.nfo winetest-dist.exe $(TESTBINS)
build.rc: dummy 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) 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)

1
tools/make_makefiles
View File

@ -99,7 +99,6 @@ my @ignores = (
"include/stamp-h", "include/stamp-h",
"msg.pot", "msg.pot",
"programs/winetest/*_test.exe", "programs/winetest/*_test.exe",
"programs/winetest/*_test.rc",
"programs/winetest/build.nfo", "programs/winetest/build.nfo",
"programs/winetest/build.rc", "programs/winetest/build.rc",
"rsrc.pot", "rsrc.pot",