|
Line
Link Here
|
|
Automake generates invalid Makefiles when patsubst is used in |
|
Automake generates invalid Makefiles when patsubst is used in |
| 1 |
Makefile.am. To work around this problem configure injects the |
1 |
Makefile.am. To work around this problem configure injects the |
| 2 |
patsubsts to the Makefile now. |
2 |
patsubsts to the Makefile now. |
| 3 |
. |
3 |
. |
| 4 |
-- gtk2-engines-2.20.2.orig/configure.ac |
4 |
++ gtk2-engines-2.20.2/configure.ac |
|
Lines 142-147
fi
Link Here
|
| 142 |
AC_SUBST(BUILD_ENGINES) |
142 |
AC_SUBST(BUILD_ENGINES) |
| 143 |
AC_SUBST(BUILD_THEMES) |
143 |
AC_SUBST(BUILD_THEMES) |
| 144 |
AC_SUBST(BUILD_SCHEMAS) |
144 |
AC_SUBST(BUILD_SCHEMAS) |
|
|
145 |
AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))']) |
| 146 |
|
| 145 |
|
147 |
|
| 146 |
if test $animation = "yes"; then |
148 |
if test $animation = "yes"; then |
| 147 |
AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support]) |
149 |
AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support]) |
| 148 |
-- gtk2-engines-2.20.2.orig/test/Makefile.am |
150 |
++ gtk2-engines-2.20.2/test/Makefile.am |
|
Lines 64-72
VALGRIND_ENV=G_SLICE=always-malloc G_DEB
Link Here
|
| 64 |
# Exported Symbols Test - Tests all engines unconditionally |
64 |
# Exported Symbols Test - Tests all engines unconditionally |
| 65 |
############################################################# |
65 |
############################################################# |
| 66 |
# Prefix with exported_ |
66 |
# Prefix with exported_ |
| 67 |
EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) |
67 |
# disabled to work around automake bug #14561 |
|
|
68 |
# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) |
| 68 |
|
69 |
|
| 69 |
TESTS += $(EXPORTED_SYMBOLS_TESTS) |
70 |
#TESTS += $(EXPORTED_SYMBOLS_TESTS) |
| 70 |
|
71 |
|
| 71 |
|
72 |
|
| 72 |
############################################################# |
73 |
############################################################# |
|
Lines 85-94
SUPPORTED_TORTURE_TEST_ENGINES = \
Link Here
|
| 85 |
# Filter engines that are not build from the set of engines |
86 |
# Filter engines that are not build from the set of engines |
| 86 |
TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES)) |
87 |
TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES)) |
| 87 |
# Prefix with torture_ |
88 |
# Prefix with torture_ |
| 88 |
TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) |
89 |
# disabled to work around automake bug #14561 |
|
|
90 |
# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) |
| 89 |
|
91 |
|
| 90 |
# Add TORTURE_TEST_ENGINES to list of tests |
92 |
# Add TORTURE_TEST_ENGINES to list of tests |
| 91 |
TESTS += $(TORTURE_TEST_TESTS) |
93 |
# disabled to work around automake bug #14561 |
|
|
94 |
#TESTS += $(TORTURE_TEST_TESTS) |
| 95 |
TESTS += @auto_find_tests@ |
| 92 |
|
96 |
|
| 93 |
# Possible other tests: |
97 |
# Possible other tests: |
| 94 |
# - An extensive theme switch tests that loads/unloads the engine |
98 |
# - An extensive theme switch tests that loads/unloads the engine |
