cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=acc01fe229b61874e6172855d6998b796d138b13
commit acc01fe229b61874e6172855d6998b796d138b13 Author: Cedric Bail <[email protected]> Date: Wed Apr 20 21:30:22 2016 -0700 edje: seems the only way to force the build of this files. I can't figure out what is wrong with using BUILT_SOURCES. It should work, but doesn't. Moving to use _SOURCES is impossible again (variable again). Using the _DATA is the only technically working solution. Which they will be installed on your system even if you don't need them. If you find a way around it and still get them to build, please patch. --- src/Makefile_Edje.am | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index a25592b..e601ff1 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -271,6 +271,17 @@ if EFL_ENABLE_TESTS check_PROGRAMS += tests/edje/edje_suite TESTS += tests/edje/edje_suite +EDJE_TEST_FILES = tests/edje/data/test_layout.edj \ + tests/edje/data/complex_layout.edj \ + tests/edje/data/test_parens.edj \ + tests/edje/data/test_masking.edj \ + tests/edje/data/test_filters.edj \ + tests/edje/data/test_snapshot.edj \ + tests/edje/data/test_size_class.edj \ + tests/edje/data/test_swallows.edj \ + tests/edje/data/test_color_class.edj \ + tests/edje/data/test_box.edj + tests_edje_edje_suite_SOURCES = \ tests/edje/edje_suite.c \ tests/edje/edje_test_edje.c \ @@ -283,6 +294,8 @@ $(EDJE_COMMON_CPPFLAGS) \ @CHECK_CFLAGS@ tests_edje_edje_suite_LDADD = @CHECK_LIBS@ $(USE_EDJE_BIN_LIBS) tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ +tests_edje_edje_suitedir = $(datadir)/edje/data +tests_edje_edje_suite_DATA = $(EDJE_TEST_FILES) tests/edje/data/%.edj: tests/edje/data/%.edc bin/edje/edje_cc${EXEEXT} $(AM_V_EDJ) \ @@ -292,18 +305,6 @@ tests/edje/data/%.edj: tests/edje/data/%.edc bin/edje/edje_cc${EXEEXT} -dd $(srcdir)/tests/edje/data \ $< $@ -EDJE_TEST_FILES = tests/edje/data/test_layout.edj \ - tests/edje/data/complex_layout.edj \ - tests/edje/data/test_parens.edj \ - tests/edje/data/test_masking.edj \ - tests/edje/data/test_filters.edj \ - tests/edje/data/test_snapshot.edj \ - tests/edje/data/test_size_class.edj \ - tests/edje/data/test_swallows.edj \ - tests/edje/data/test_color_class.edj \ - tests/edje/data/test_box.edj - -noinst_DATA += $(EDJE_TEST_FILES) CLEANFILES += $(EDJE_TEST_FILES) endif --
