aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Emotion.am
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-02-17 17:59:13 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-02-17 19:14:25 +0900
commit7b896e784d44756ed29ef6de58ea3e45352cccd6 (patch)
treeaa1cd0d0c8b8ecd388389ad9c3b62201295fa849 /src/Makefile_Emotion.am
parentRevert "ecore timer: change name of Eo constructor, to avoid clash in Eolian" (diff)
downloadefl-7b896e784d44756ed29ef6de58ea3e45352cccd6.tar.gz
Fix make distcheck
Makefile_Edje contained the EXTRA_DIST files for Emotion, which doesn't make much sense. So move that to Makefile_Emotion.am. But if we want to add the test files only when EFL_TESTS is enabled, then make distcheck doesn't work. So, this is a bit weird.
Diffstat (limited to 'src/Makefile_Emotion.am')
-rw-r--r--src/Makefile_Emotion.am22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 1e99250841..668ea2094e 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -191,7 +191,16 @@ tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc${EXE
@$(MKDIR_P) tests/emotion/data
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@
-EMOTION_DATA_FILES = \
+emotiondatafilesdir = $(datadir)/emotion/data
+emotiondatafiles_DATA = tests/emotion/data/theme.edj
+CLEANFILES += tests/emotion/data/theme.edj
+
+endif
+endif
+
+# Those probably should be in the if block, but then
+# "make distcheck" would not work
+EXTRA_DIST += \
tests/emotion/data/bpause.png \
tests/emotion/data/bplay.png \
tests/emotion/data/bstop.png \
@@ -219,14 +228,5 @@ tests/emotion/data/video_frame_left.png \
tests/emotion/data/video_frame_right.png \
tests/emotion/data/video_frame_top.png \
tests/emotion/data/whb.png \
-tests/emotion/data/window_inner_shadow.png
-
-emotiondatafilesdir = $(datadir)/emotion/data
-emotiondatafiles_DATA = tests/emotion/data/theme.edj
-CLEANFILES += tests/emotion/data/theme.edj
-endif
-endif
-
-EXTRA_DIST += \
-$(EMOTION_DATA_FILES) \
+tests/emotion/data/window_inner_shadow.png \
modules/emotion/generic/README