summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-16 18:28:43 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-16 18:28:43 +0000
commit4d050b6d4ecc74b7e3bd58f5091eee1287b138bd (patch)
tree139f1a68af13d34963d824874cd2d0e12b59f722
parent22a48925b17b0fadcac8cfc45dd5ef5bc124d86b (diff)
fix distcheck.
it was failing: - leaving missing objects (.edj, .la) - eo was not building its examples automatically with --enable-always-build-examples - make dist with '--enable-always-build-examples' was not including 'src/examples' plus lots of ignored files due test changes. SVN revision: 82894
-rw-r--r--data/Makefile.am5
-rw-r--r--src/Makefile.am73
-rw-r--r--src/Makefile_Eina.am5
-rw-r--r--src/Makefile_Emotion.am1
-rw-r--r--src/Makefile_Ethumb.am1
-rw-r--r--src/examples/eo/Makefile.am4
6 files changed, 13 insertions, 76 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 0380159..65205e4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EXTRA_DIST = 3EXTRA_DIST =
4CLEANFILES =
4 5
5######################################################################## 6########################################################################
6# Embryo 7# Embryo
@@ -85,8 +86,8 @@ ethumbfiles_DATA = ethumb/checkme
85EXTRA_DIST += $(ethumbfiles_DATA) 86EXTRA_DIST += $(ethumbfiles_DATA)
86 87
87ethumbframesdir = $(datadir)/ethumb/frames 88ethumbframesdir = $(datadir)/ethumb/frames
88ethumbframes_DATA = \ 89ethumbframes_DATA = ethumb/frames/default.edj
89ethumb/frames/default.edj 90CLEANFILES += ethumb/frames/default.edj
90 91
91ethumb/frames/default.edj: ethumb/frames/default.edc 92ethumb/frames/default.edj: ethumb/frames/default.edc
92 @$(MKDIR_P) ethumb/frames/ 93 @$(MKDIR_P) ethumb/frames/
diff --git a/src/Makefile.am b/src/Makefile.am
index 8600eac..7dce3c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
1AUTOMAKE_OPTIONS = subdir-objects 1AUTOMAKE_OPTIONS = subdir-objects
2 2
3MAINTAINERCLEANFILES = Makefile.in 3MAINTAINERCLEANFILES = Makefile.in
4CLEANFILES =
4BUILT_SOURCES = 5BUILT_SOURCES =
5 6
6DIST_SUBDIRS = 7DIST_SUBDIRS =
@@ -77,9 +78,8 @@ examples/emotion \
77examples/ethumb_client 78examples/ethumb_client
78if ALWAYS_BUILD_EXAMPLES 79if ALWAYS_BUILD_EXAMPLES
79SUBDIRS += . $(EXAMPLES_SUBDIRS) 80SUBDIRS += . $(EXAMPLES_SUBDIRS)
80else
81DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
82endif 81endif
82DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
83 83
84examples: all-am 84examples: all-am
85 @for d in $(EXAMPLES_SUBDIRS); do \ 85 @for d in $(EXAMPLES_SUBDIRS); do \
@@ -94,71 +94,4 @@ install-examples:
94 done 94 done
95 95
96clean-local: 96clean-local:
97 rm -rf bin/eet/*.gcno 97 find . -type f -name '*.gcno' -delete
98 rm -rf bin/efreet/*.gcno
99 rm -rf bin/eeze/*.gcno
100 rm -rf bin/edje/*.gcno
101 rm -rf lib/evil/*.gcno
102 rm -rf lib/eina/*.gcno
103 rm -rf lib/eo/*.gcno
104 rm -rf lib/eet/*.gcno
105 rm -rf lib/evas/*.gcno
106 rm -rf lib/evas/cache/*.gcno
107 rm -rf lib/evas/cache2/*.gcno
108 rm -rf lib/evas/canvas/*.gcno
109 rm -rf lib/evas/common/*.gcno
110 rm -rf lib/evas/common/evas_op_blend/*.gcno
111 rm -rf lib/evas/common/language/*.gcno
112 rm -rf lib/evas/cserve2/*.gcno
113 rm -rf lib/evas/file/*.gcno
114 rm -rf lib/embryo/*.gcno
115 rm -rf lib/edbus/*.gcno
116 rm -rf lib/efreet/*.gcno
117 rm -rf lib/eeze/*.gcno
118 rm -rf lib/ephysics/*.gcno
119 rm -rf lib/edje/*.gcno
120 rm -rf lib/emotion/*.gcno
121 rm -rf modules/eina/mp/pass_through/*.gcno
122 rm -rf modules/eina/mp/one_big/*.gcno
123 rm -rf modules/eina/mp/chained_pool/*.gcno
124 rm -rf modules/evas/engines/buffer/*.gcno
125 rm -rf modules/evas/engines/direct3d/*.gcno
126 rm -rf modules/evas/engines/fb/*.gcno
127 rm -rf modules/evas/engines/gl_cocoa/*.gcno
128 rm -rf modules/evas/engines/gl_common/*.gcno
129 rm -rf modules/evas/engines/gl_sdl/*.gcno
130 rm -rf modules/evas/engines/gl_x11/*.gcno
131 rm -rf modules/evas/engines/psl1ght/*.gcno
132 rm -rf modules/evas/engines/software_ddraw/*.gcno
133 rm -rf modules/evas/engines/software_gdi/*.gcno
134 rm -rf modules/evas/engines/software_generic/*.gcno
135 rm -rf modules/evas/engines/software_x11/*.gcno
136 rm -rf modules/evas/engines/wayland_egl/*.gcno
137 rm -rf modules/evas/engines/wayland_shm/*.gcno
138 rm -rf modules/evas/loaders/bmp/*.gcno
139 rm -rf modules/evas/loaders/eet/*.gcno
140 rm -rf modules/evas/loaders/generic/*.gcno
141 rm -rf modules/evas/loaders/gif/*.gcno
142 rm -rf modules/evas/loaders/ico/*.gcno
143 rm -rf modules/evas/loaders/jpeg/*.gcno
144 rm -rf modules/evas/loaders/pmaps/*.gcno
145 rm -rf modules/evas/loaders/png/*.gcno
146 rm -rf modules/evas/loaders/psd/*.gcno
147 rm -rf modules/evas/loaders/svg/*.gcno
148 rm -rf modules/evas/loaders/tga/*.gcno
149 rm -rf modules/evas/loaders/tiff/*.gcno
150 rm -rf modules/evas/loaders/wbmp/*.gcno
151 rm -rf modules/evas/loaders/webp/*.gcno
152 rm -rf modules/evas/loaders/xpm/*.gcno
153 rm -rf modules/evas/savers/eet/*.gcno
154 rm -rf modules/evas/savers/jpeg/*.gcno
155 rm -rf modules/evas/savers/png/*.gcno
156 rm -rf modules/evas/savers/tiff/*.gcno
157 rm -rf modules/edje/alsa_snd_player/*.gcno
158 rm -rf modules/edje/eet_snd_reader/*.gcno
159 rm -rf modules/edje/multisense_factory/*.gcno
160 rm -rf modules/emotion/xine/*.gcno
161 rm -rf modules/emotion/gstreamer/*.gcno
162 rm -rf modules/emotion/generic/*.gcno
163 rm -rf static_libs/libunibreak/*.gcno
164 rm -rf static_libs/lz4/*.gcno
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 08899d3..58f4298 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -276,12 +276,9 @@ tests_eina_cxx_compile_test_CPPFLAGS = @EINA_CFLAGS@
276tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@ 276tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@
277tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ 277tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
278 278
279EXTRA_LTLIBRARIES = tests/eina/module_dummy.la 279check_LTLIBRARIES = tests/eina/module_dummy.la
280
281check-local: tests/eina/module_dummy.la
282 280
283tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c 281tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
284
285tests_eina_module_dummy_la_CPPFLAGS = \ 282tests_eina_module_dummy_la_CPPFLAGS = \
286-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ 283-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
287@CHECK_CFLAGS@ \ 284@CHECK_CFLAGS@ \
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 085f2b4..dc1f188 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -189,6 +189,7 @@ tests/emotion/data/window_inner_shadow.png
189 189
190emotiondatafilesdir = $(datadir)/emotion/data 190emotiondatafilesdir = $(datadir)/emotion/data
191emotiondatafiles_DATA = tests/emotion/data/theme.edj 191emotiondatafiles_DATA = tests/emotion/data/theme.edj
192CLEANFILES += tests/emotion/data/theme.edj
192endif 193endif
193 194
194EXTRA_DIST += \ 195EXTRA_DIST += \
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index f81d858..c2aa2d3 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -52,6 +52,7 @@ modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules
52 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/modules/ethumb/emotion $< $@ 52 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/modules/ethumb/emotion $< $@
53 53
54ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj 54ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj
55CLEANFILES += modules/ethumb/emotion/template.edj
55 56
56EXTRA_DIST += \ 57EXTRA_DIST += \
57modules/ethumb/emotion/template.edc \ 58modules/ethumb/emotion/template.edc \
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index eeca8cb..540d3fc 100644
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -84,3 +84,7 @@ uninstall-local:
84 for f in $(simple_SOURCES) ; do \ 84 for f in $(simple_SOURCES) ; do \
85 rm -f $(datadir)/eo/examples/simple/$$f ; \ 85 rm -f $(datadir)/eo/examples/simple/$$f ; \
86 done 86 done
87
88if ALWAYS_BUILD_EXAMPLES
89noinst_PROGRAMS = $(EXTRA_PROGRAMS)
90endif