tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e3e9de236c7a2cb37eb01746513ecf877b4a030c
commit e3e9de236c7a2cb37eb01746513ecf877b4a030c
Author: Tom Hacohen <t...@stosb.com>
Date: Fri Apr 15 18:18:03 2016 +0100
Edje tests: Don't ship test edje files and clean up their generation.
This was duplication hell and also quite stupid. This commit should fix
this mess (to an extent).
---
src/Makefile_Edje.am | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 458a98f..d716a97 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -289,18 +289,7 @@ tests/edje/data/%.edj: tests/edje/data/%.edc
bin/edje/edje_cc${EXEEXT}
-dd $(srcdir)/tests/edje/data \
$< $@
-EDJE_DATA_FILES = tests/edje/data/test_layout.edc \
- tests/edje/data/complex_layout.edc \
- tests/edje/data/test_parens.edc \
- tests/edje/data/test_masking.edc \
- tests/edje/data/test_filters.edc \
- tests/edje/data/test_snapshot.edc \
- tests/edje/data/test_size_class.edc \
- tests/edje/data/test_color_class.edc \
- tests/edje/data/filter.lua
-
-edjedatafilesdir = $(datadir)/edje/data
-edjedatafiles_DATA = tests/edje/data/test_layout.edj \
+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 \
@@ -309,19 +298,11 @@ edjedatafiles_DATA = tests/edje/data/test_layout.edj \
tests/edje/data/test_size_class.edj \
tests/edje/data/test_color_class.edj
-CLEANFILES += 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_color_class.edj
+noinst_DATA += $(EDJE_TEST_FILES)
+CLEANFILES += $(EDJE_TEST_FILES)
endif
-EXTRA_DIST += $(EDJE_DATA_FILES)
-
if HAVE_ELUA
edje_eolian_lua = $(edje_eolian_files:%.eo=%.eo.lua)
--
