mirror of
https://github.com/wine-mirror/wine
synced 2024-07-08 20:06:18 +00:00
makefiles: Avoid creating an intermediate rc file for test binaries.
This commit is contained in:
parent
5d19caf9e5
commit
305aca28b4
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -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
|
||||
|
|
5
aclocal.m4
vendored
5
aclocal.m4
vendored
|
@ -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 \
|
||||
|
|
5
configure
vendored
5
configure
vendored
|
@ -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 :
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue
Block a user