summaryrefslogtreecommitdiff
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
parentd3851b30268bd415a8789add914eae21070e832c (diff)
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.
-rw-r--r--src/Makefile_Edje.am27
-rw-r--r--src/Makefile_Emotion.am22
2 files changed, 12 insertions, 37 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 6b4cad4849..2ecd3d449b 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -212,32 +212,7 @@ bin/edje/edje_convert_main.c \
212lib/edje/edje_convert.c \ 212lib/edje/edje_convert.c \
213tests/edje/edje_tests_helpers.h \ 213tests/edje/edje_tests_helpers.h \
214tests/edje/data/complex_layout.edc \ 214tests/edje/data/complex_layout.edc \
215tests/edje/data/test_layout.edc \ 215tests/edje/data/test_layout.edc
216tests/emotion/data/theme.edc \
217tests/emotion/data/icon.edc \
218tests/emotion/data/bpause.png \
219tests/emotion/data/bplay.png \
220tests/emotion/data/bstop.png \
221tests/emotion/data/e_logo.png \
222tests/emotion/data/fr1.png \
223tests/emotion/data/fr2.png \
224tests/emotion/data/fr3.png \
225tests/emotion/data/fr4.png \
226tests/emotion/data/fr5.png \
227tests/emotion/data/fr6.png \
228tests/emotion/data/fr7.png \
229tests/emotion/data/h_slider.png \
230tests/emotion/data/knob.png \
231tests/emotion/data/orb.png \
232tests/emotion/data/pnl.png \
233tests/emotion/data/sl.png \
234tests/emotion/data/tiles.png \
235tests/emotion/data/video_frame_bottom.png \
236tests/emotion/data/video_frame_left.png \
237tests/emotion/data/video_frame_right.png \
238tests/emotion/data/video_frame_top.png \
239tests/emotion/data/whb.png \
240tests/emotion/data/window_inner_shadow.png
241 216
242 217
243bin_SCRIPTS += bin/edje/edje_recc 218bin_SCRIPTS += bin/edje/edje_recc
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
191 @$(MKDIR_P) tests/emotion/data 191 @$(MKDIR_P) tests/emotion/data
192 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@ 192 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@
193 193
194EMOTION_DATA_FILES = \ 194emotiondatafilesdir = $(datadir)/emotion/data
195emotiondatafiles_DATA = tests/emotion/data/theme.edj
196CLEANFILES += tests/emotion/data/theme.edj
197
198endif
199endif
200
201# Those probably should be in the if block, but then
202# "make distcheck" would not work
203EXTRA_DIST += \
195tests/emotion/data/bpause.png \ 204tests/emotion/data/bpause.png \
196tests/emotion/data/bplay.png \ 205tests/emotion/data/bplay.png \
197tests/emotion/data/bstop.png \ 206tests/emotion/data/bstop.png \
@@ -219,14 +228,5 @@ tests/emotion/data/video_frame_left.png \
219tests/emotion/data/video_frame_right.png \ 228tests/emotion/data/video_frame_right.png \
220tests/emotion/data/video_frame_top.png \ 229tests/emotion/data/video_frame_top.png \
221tests/emotion/data/whb.png \ 230tests/emotion/data/whb.png \
222tests/emotion/data/window_inner_shadow.png 231tests/emotion/data/window_inner_shadow.png \
223
224emotiondatafilesdir = $(datadir)/emotion/data
225emotiondatafiles_DATA = tests/emotion/data/theme.edj
226CLEANFILES += tests/emotion/data/theme.edj
227endif
228endif
229
230EXTRA_DIST += \
231$(EMOTION_DATA_FILES) \
232modules/emotion/generic/README 232modules/emotion/generic/README