Alexandre Julliard : makefiles: Expand the test resource list through a makefile variable.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Nov 13 18:56:20 2015 +0900

makefiles: Expand the test resource list through a makefile variable.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 Makefile.in                   | 1 +
 configure                     | 2 +-
 configure.ac                  | 2 +-
 programs/winetest/Makefile.in | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4760fec..1c5a44d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,6 +99,7 @@ LIBWINE_INSTALL_LIB = @LIBWINE_INSTALL_LIB@
 LIBWINE_INSTALL_DEV = @LIBWINE_INSTALL_DEV@
 LIBWINE_LDFLAGS     = @LIBWINE_LDFLAGS@
 LIBWINE_DEPENDS     = @LIBWINE_DEPENDS@
+ALL_TEST_RESOURCES  = @ALL_TEST_RESOURCES@
 @ALL_VARS_RULES@
 @SET_MAKE@
 
diff --git a/configure b/configure
index 69654d1..3903e4f 100755
--- a/configure
+++ b/configure
@@ -18136,7 +18136,7 @@ wine_fn_config_program winemenubuilder enable_winemenubuilder install
 wine_fn_config_program winemine enable_winemine install,installbin,manpage,po
 wine_fn_config_program winemsibuilder enable_winemsibuilder install
 wine_fn_config_program winepath enable_winepath install,installbin,manpage
-wine_fn_config_program winetest enable_winetest clean,config
+wine_fn_config_program winetest enable_winetest clean
 wine_fn_config_program winevdm enable_win16 install
 wine_fn_config_program winhelp.exe16 enable_win16 install
 wine_fn_config_program winhlp32 enable_winhlp32 install,po
diff --git a/configure.ac b/configure.ac
index b748f1b..7d2449f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3468,7 +3468,7 @@ WINE_CONFIG_PROGRAM(winemenubuilder,,[install])
 WINE_CONFIG_PROGRAM(winemine,,[install,installbin,manpage,po])
 WINE_CONFIG_PROGRAM(winemsibuilder,,[install])
 WINE_CONFIG_PROGRAM(winepath,,[install,installbin,manpage])
-WINE_CONFIG_PROGRAM(winetest,,[clean,config])
+WINE_CONFIG_PROGRAM(winetest,,[clean])
 WINE_CONFIG_PROGRAM(winevdm,enable_win16,[install])
 WINE_CONFIG_PROGRAM(winhelp.exe16,enable_win16,[install])
 WINE_CONFIG_PROGRAM(winhlp32,,[install,po])
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 4070016..64f5172 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -14,7 +14,7 @@ RC_SRCS = \
 
 SVG_SRCS = winetest.svg
 
-EXTRA_OBJS = build.res @ALL_TEST_RESOURCES@
+EXTRA_OBJS = build.res $(ALL_TEST_RESOURCES)
 
 EXTRA_TARGETS = build.rc build.nfo