summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-04-15 18:18:03 +0100
committerTom Hacohen <tom@stosb.com>2016-04-15 18:20:34 +0100
commite3e9de236c7a2cb37eb01746513ecf877b4a030c (patch)
treeff95eb8d5ca5e9098314d9f37f7a297dbfddc8e7
parentb337558fd673b88d3ae016f018dbab6f321150e1 (diff)
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).
-rw-r--r--src/Makefile_Edje.am25
1 files changed, 3 insertions, 22 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 458a98ff67..d716a9764a 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}
289 -dd $(srcdir)/tests/edje/data \ 289 -dd $(srcdir)/tests/edje/data \
290 $< $@ 290 $< $@
291 291
292EDJE_DATA_FILES = tests/edje/data/test_layout.edc \ 292EDJE_TEST_FILES = tests/edje/data/test_layout.edj \
293 tests/edje/data/complex_layout.edc \
294 tests/edje/data/test_parens.edc \
295 tests/edje/data/test_masking.edc \
296 tests/edje/data/test_filters.edc \
297 tests/edje/data/test_snapshot.edc \
298 tests/edje/data/test_size_class.edc \
299 tests/edje/data/test_color_class.edc \
300 tests/edje/data/filter.lua
301
302edjedatafilesdir = $(datadir)/edje/data
303edjedatafiles_DATA = tests/edje/data/test_layout.edj \
304 tests/edje/data/complex_layout.edj \ 293 tests/edje/data/complex_layout.edj \
305 tests/edje/data/test_parens.edj \ 294 tests/edje/data/test_parens.edj \
306 tests/edje/data/test_masking.edj \ 295 tests/edje/data/test_masking.edj \
@@ -309,19 +298,11 @@ edjedatafiles_DATA = tests/edje/data/test_layout.edj \
309 tests/edje/data/test_size_class.edj \ 298 tests/edje/data/test_size_class.edj \
310 tests/edje/data/test_color_class.edj 299 tests/edje/data/test_color_class.edj
311 300
312CLEANFILES += tests/edje/data/test_layout.edj \ 301noinst_DATA += $(EDJE_TEST_FILES)
313 tests/edje/data/complex_layout.edj \ 302CLEANFILES += $(EDJE_TEST_FILES)
314 tests/edje/data/test_parens.edj \
315 tests/edje/data/test_masking.edj \
316 tests/edje/data/test_filters.edj \
317 tests/edje/data/test_snapshot.edj \
318 tests/edje/data/test_size_class.edj \
319 tests/edje/data/test_color_class.edj
320 303
321endif 304endif
322 305
323EXTRA_DIST += $(EDJE_DATA_FILES)
324
325if HAVE_ELUA 306if HAVE_ELUA
326 307
327edje_eolian_lua = $(edje_eolian_files:%.eo=%.eo.lua) 308edje_eolian_lua = $(edje_eolian_files:%.eo=%.eo.lua)