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

makefiles: Create the binary resources for winetest from the top-level makefile.

This commit is contained in:
Alexandre Julliard 2011-05-22 13:15:03 +02:00
parent 305aca28b4
commit e4eff85c8b
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
aclocal.m4 vendored
View File

@ -151,7 +151,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status
@./config.status Make.tmp Makefile"
ALL_POT_FILES=""
AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_TEST_BINARIES,"")
wine_fn_append_file ()
@ -392,19 +391,19 @@ wine_fn_config_test ()
ac_dir=$[1]
ac_name=$[2]
wine_fn_append_file ALL_TEST_BINARIES $ac_name.exe
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.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 \
"all programs/winetest: $ac_dir
"all $ac_dir/$ac_name.exe$DLLEXT: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd $ac_dir && \$(MAKE)
test: $ac_dir/__test__
programs/winetest/$ac_name.exe: $ac_dir/$ac_name.exe$DLLEXT
cp $ac_dir/$ac_name.exe$DLLEXT \$[@] && \$(STRIP) \$[@]
programs/winetest/$ac_name.res: programs/winetest/$ac_name.exe
echo \"$ac_name.exe TESTRES \\\"programs/winetest/$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$[@]
programs/winetest: programs/winetest/$ac_name.res
check test: $ac_dir/__test__
.PHONY: $ac_dir/__test__
$ac_dir/__test__: dummy
@cd $ac_dir && \$(MAKE) test

17
configure vendored
View File

@ -606,7 +606,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
LINGUAS
ALL_TEST_BINARIES
ALL_WINETEST_DEPENDS
LDAPLIBS
LIBPOLL
LIBDL
@ -14609,8 +14608,6 @@ Makefile: Makefile.in Make.vars.in Make.rules config.status
@./config.status Make.tmp Makefile"
ALL_POT_FILES=""
ALL_WINETEST_DEPENDS="# Test binaries"
ALL_TEST_BINARIES=""
@ -14858,22 +14855,22 @@ wine_fn_config_test ()
ac_dir=$1
ac_name=$2
wine_fn_append_file ALL_TEST_BINARIES $ac_name.exe
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.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 :
else
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all programs/winetest: $ac_dir
"all $ac_dir/$ac_name.exe$DLLEXT: $ac_dir
.PHONY: $ac_dir
$ac_dir: $ac_dir/Makefile __builddeps__ dummy
@cd $ac_dir && \$(MAKE)
test: $ac_dir/__test__
programs/winetest/$ac_name.exe: $ac_dir/$ac_name.exe$DLLEXT
cp $ac_dir/$ac_name.exe$DLLEXT \$@ && \$(STRIP) \$@
programs/winetest/$ac_name.res: programs/winetest/$ac_name.exe
echo \"$ac_name.exe TESTRES \\\"programs/winetest/$ac_name.exe\\\"\" | \$(LDPATH) \$(WRC) \$(RCFLAGS) -o \$@
programs/winetest: programs/winetest/$ac_name.res
check test: $ac_dir/__test__
.PHONY: $ac_dir/__test__
$ac_dir/__test__: dummy
@cd $ac_dir && \$(MAKE) test

2
programs/winetest/Makefile.in
View File

@ -39,5 +39,3 @@ dist: winetest-dist.exe$(DLLEXT)
winetest-dist.exe$(DLLEXT): winetest.exe$(DLLEXT)
cp winetest.exe$(DLLEXT) $@
-upx -9 -qqq $@
@ALL_WINETEST_DEPENDS@