summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-06-08 10:26:06 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2016-06-10 13:04:18 +0200
commit93eadd76d6d49bbe1e49eaf976b4c6fd5545f340 (patch)
tree1d5e92af79028658a3c858fc29cd1181a438279c
parente165854a78949cd76fedd84cd124de2185c910c9 (diff)
build: split EXTRA_DIST files in src/ off from DISTFILES and handle separately
This is again to avoid the "Argument list too long" error we are hitting more and more now. Given we just merged elementary, emotion generic players, evas generic loaders and elm_code it is not surprising we are hitting it again. This time the number of files being hold in DISTFILES has just grown to big so a make dist was no longer possible. If one looks at what the DISTFILES variable from automake holds you can image it grows a lot with all the source files plus generated files we have in tree now. DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) To cut off a big chunk but still keep all the other automagic in place for SOURCE files I went and renamed the EXTRA_DIST in src/ to EXTRA_DIST2 and handle the files in a dist-hook now. Another thing to note here is that this also only happens as we have the one big Makefile with includes. If we go back to per directory Makefiles this problem should vanish as well. In any case we need a solution for 1.18 now and this is what I have to offer. If you have a cleaner solution in mind feel welcome to test it out and if everything we need keeps working (make, make examples, make check, make benchmark, make dist and make distcheck) go ahead.
-rw-r--r--src/Makefile.am16
-rw-r--r--src/Makefile_Cxx.am2
-rw-r--r--src/Makefile_Ecore.am6
-rw-r--r--src/Makefile_Ecore_Audio.am2
-rw-r--r--src/Makefile_Ecore_Con.am6
-rw-r--r--src/Makefile_Ecore_Psl1ght.am2
-rw-r--r--src/Makefile_Ecore_X.am2
-rw-r--r--src/Makefile_Ector.am4
-rw-r--r--src/Makefile_Edje.am4
-rw-r--r--src/Makefile_Eet.am2
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/Makefile_Efl_Js.am2
-rw-r--r--src/Makefile_Efreet.am2
-rw-r--r--src/Makefile_Eina.am2
-rw-r--r--src/Makefile_Eio.am2
-rw-r--r--src/Makefile_Eldbus.am2
-rw-r--r--src/Makefile_Elementary.am14
-rw-r--r--src/Makefile_Elua.am12
-rw-r--r--src/Makefile_Embryo.am2
-rw-r--r--src/Makefile_Emile.am2
-rw-r--r--src/Makefile_Emotion.am4
-rw-r--r--src/Makefile_Eo.am4
-rw-r--r--src/Makefile_Eolian.am2
-rw-r--r--src/Makefile_Eolian_Cxx.am2
-rw-r--r--src/Makefile_Ethumb.am2
-rw-r--r--src/Makefile_Evas.am40
-rw-r--r--src/Makefile_Evil.am4
27 files changed, 80 insertions, 66 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ab50e0b0c..36822c9a6b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ bin_SCRIPTS =
15noinst_PROGRAMS = 15noinst_PROGRAMS =
16check_PROGRAMS = 16check_PROGRAMS =
17TESTS = 17TESTS =
18EXTRA_DIST = 18EXTRA_DIST2 =
19 19
20noinst_LTLIBRARIES = 20noinst_LTLIBRARIES =
21noinst_DATA = 21noinst_DATA =
@@ -160,6 +160,20 @@ install-examples:
160 $(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \ 160 $(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \
161 done 161 done
162 162
163dist-hook:
164 @mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data
165 @mkdir -p $(distdir)/tests/evas/images $(distdir)/tests/evas/meshes
166 @mkdir -p $(distdir)/tests/efreet/data $(distdir)/tests/edje/data
167 @mkdir -p $(distdir)/tests/emotion/data $(distdir)/tests/evas/meshes/md2
168 @mkdir -p $(distdir)/tests/evas/meshes/obj $(distdir)/tests/efreet/data/sub
169 @mkdir -p $(distdir)/scripts/eina $(distdir)/scripts/elua/modules
170 @mkdir -p $(distdir)/scripts/elua/core $(distdir)/scripts/elua/apps/docgen
171 @mkdir -p $(distdir)/lib/evas/common/evas_op_add $(distdir)/lib/evas/common/evas_op_copy
172 @mkdir -p $(distdir)/lib/evas/common/evas_op_mask $(distdir)/lib/evas/common/evas_op_mul
173 @mkdir -p $(distdir)/lib/evas/common/evas_op_sub $(distdir)/lib/evas/filters/blur
174 @mkdir -p $(distdir)/static_libs/http-parser/contrib $(distdir)/bindings/luajit/eina
175 for F in $(EXTRA_DIST2); do cp -f $(srcdir)/$$F $(distdir)/$$F; done
176
163clean-local: 177clean-local:
164 find . -type f -name '*.gcno' -delete 178 find . -type f -name '*.gcno' -delete
165 find . -type f -name '*.gcda' -delete 179 find . -type f -name '*.gcda' -delete
diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
index 671db7a158..ea4ec592df 100644
--- a/src/Makefile_Cxx.am
+++ b/src/Makefile_Cxx.am
@@ -233,7 +233,7 @@ tests_eina_cxx_eina_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
233tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@ 233tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@
234tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@ 234tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
235 235
236EXTRA_DIST += \ 236EXTRA_DIST2 += \
237tests/eina_cxx/simple.eo 237tests/eina_cxx/simple.eo
238 238
239### Tests for ecore 239### Tests for ecore
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 83f5407668..b9c83f5d69 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -30,7 +30,7 @@ ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
30ecoreeolianfiles_DATA = $(ecore_eolian_files) \ 30ecoreeolianfiles_DATA = $(ecore_eolian_files) \
31 $(ecore_eolian_type_files) 31 $(ecore_eolian_type_files)
32 32
33EXTRA_DIST += lib/ecore/Makefile.am \ 33EXTRA_DIST2 += lib/ecore/Makefile.am \
34 lib/ecore/Makefile.in \ 34 lib/ecore/Makefile.in \
35 ${ecoreeolianfiles_DATA} 35 ${ecoreeolianfiles_DATA}
36 36
@@ -77,7 +77,7 @@ lib/ecore/ecore_private.h
77if HAVE_WIN32 77if HAVE_WIN32
78lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_win32.c 78lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_win32.c
79else 79else
80EXTRA_DIST += lib/ecore/ecore_exe_ps3.c 80EXTRA_DIST2 += lib/ecore/ecore_exe_ps3.c
81#if ECORE_HAVE_PS3 81#if ECORE_HAVE_PS3
82#libecore_la_SOURCES += ecore_exe_ps3.c 82#libecore_la_SOURCES += ecore_exe_ps3.c
83#else 83#else
@@ -262,7 +262,7 @@ endif
262 262
263endif 263endif
264 264
265EXTRA_DIST += \ 265EXTRA_DIST2 += \
266tests/ecore/sample.wav \ 266tests/ecore/sample.wav \
267tests/ecore/sample.ogg 267tests/ecore/sample.ogg
268 268
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 2a3dfd8baf..f5d45cc0f0 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -29,7 +29,7 @@ BUILT_SOURCES += \
29ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 29ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
30ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files) 30ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files)
31 31
32EXTRA_DIST += \ 32EXTRA_DIST2 += \
33 ${ecore_audioeolianfiles_DATA} 33 ${ecore_audioeolianfiles_DATA}
34 34
35lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la 35lib_LTLIBRARIES += lib/ecore_audio/libecore_audio.la
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index d68a777951..f3f147fb51 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -23,7 +23,7 @@ ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
23ecoreconeolianfiles_DATA = \ 23ecoreconeolianfiles_DATA = \
24 $(ecore_con_eolian_files) 24 $(ecore_con_eolian_files)
25 25
26EXTRA_DIST += \ 26EXTRA_DIST2 += \
27 ${ecoreconeolianfiles_DATA} 27 ${ecoreconeolianfiles_DATA}
28 28
29lib_LTLIBRARIES += lib/ecore_con/libecore_con.la 29lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
@@ -54,7 +54,7 @@ static_libs/http-parser/http_parser.h \
54lib/ecore_con/ecore_con_private.h \ 54lib/ecore_con/ecore_con_private.h \
55lib/ecore_con/ecore_con_info.c 55lib/ecore_con/ecore_con_info.c
56 56
57EXTRA_DIST += lib/ecore_con/ecore_con_legacy.c 57EXTRA_DIST2 += lib/ecore_con/ecore_con_legacy.c
58 58
59if HAVE_WINDOWS 59if HAVE_WINDOWS
60lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local_win32.c 60lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_local_win32.c
@@ -69,7 +69,7 @@ lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
69 69
70lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser 70lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser
71 71
72EXTRA_DIST += \ 72EXTRA_DIST2 += \
73tests/ecore_con/server.key \ 73tests/ecore_con/server.key \
74tests/ecore_con/server.pem \ 74tests/ecore_con/server.pem \
75static_libs/http-parser/AUTHORS \ 75static_libs/http-parser/AUTHORS \
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index 8c1f7fdfc7..8d7b3a4a10 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -24,6 +24,6 @@ lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
24endif 24endif
25 25
26# TODO: what are they used for? 26# TODO: what are they used for?
27EXTRA_DIST += \ 27EXTRA_DIST2 += \
28lib/ecore_psl1ght/gemutil.c \ 28lib/ecore_psl1ght/gemutil.c \
29lib/ecore_psl1ght/gemutil.h 29lib/ecore_psl1ght/gemutil.h
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index 1b4c2b63cd..556ab808bd 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -145,4 +145,4 @@ utils_ecore_makekeys_SOURCES = utils/ecore/makekeys.c
145utils_ecore_makekeys_CFLAGS = @ECORE_X_CFLAGS@ 145utils_ecore_makekeys_CFLAGS = @ECORE_X_CFLAGS@
146 146
147endif 147endif
148EXTRA_DIST += utils/ecore/mkks.sh 148EXTRA_DIST2 += utils/ecore/mkks.sh
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 33c3bfd03c..30aa866c50 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -64,7 +64,7 @@ BUILT_SOURCES += \
64ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@ 64ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@
65ectoreolianfiles_DATA = $(ector_eolian_files) $(ector_eolian_type_files) 65ectoreolianfiles_DATA = $(ector_eolian_files) $(ector_eolian_type_files)
66 66
67EXTRA_DIST += $(ectoreolianfiles_DATA) \ 67EXTRA_DIST2 += $(ectoreolianfiles_DATA) \
68lib/ector/Makefile.am \ 68lib/ector/Makefile.am \
69lib/ector/Makefile.in \ 69lib/ector/Makefile.in \
70lib/ector/Ector.h \ 70lib/ector/Ector.h \
@@ -195,7 +195,7 @@ tests_ector_ector_suite_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@
195 195
196endif 196endif
197 197
198EXTRA_DIST += \ 198EXTRA_DIST2 += \
199lib/ector/ector_private.h \ 199lib/ector/ector_private.h \
200lib/ector/cairo/ector_cairo_private.h \ 200lib/ector/cairo/ector_cairo_private.h \
201lib/ector/software/ector_software_private.h \ 201lib/ector/software/ector_software_private.h \
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index b213db5adc..720bed5f39 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -35,7 +35,7 @@ edjeeolianfiles_DATA = \
35 35
36noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h) 36noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h)
37 37
38EXTRA_DIST += lib/edje/Makefile.am \ 38EXTRA_DIST2 += lib/edje/Makefile.am \
39 lib/edje/Makefile.in \ 39 lib/edje/Makefile.in \
40 ${edjeeolianfiles_DATA} \ 40 ${edjeeolianfiles_DATA} \
41 $(edje_eolian_priv_files) 41 $(edje_eolian_priv_files)
@@ -256,7 +256,7 @@ bin_edje_epp_epp_LDADD = lib/evil/libevil.la
256endif 256endif
257 257
258# TODO: why keep these? 258# TODO: why keep these?
259EXTRA_DIST += \ 259EXTRA_DIST2 += \
260bin/edje/edje_convert.h \ 260bin/edje/edje_convert.h \
261bin/edje/edje_convert.c \ 261bin/edje/edje_convert.c \
262bin/edje/edje_data_convert.c \ 262bin/edje/edje_data_convert.c \
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index bcca21022e..a3c8a72563 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -85,7 +85,7 @@ tests_eet_eet_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
85tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@ 85tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
86endif 86endif
87 87
88EXTRA_DIST += \ 88EXTRA_DIST2 += \
89tests/eet/cert.pem \ 89tests/eet/cert.pem \
90tests/eet/key_enc_none.pem \ 90tests/eet/key_enc_none.pem \
91tests/eet/key_enc.pem \ 91tests/eet/key_enc.pem \
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index d9119eb2cf..924d4912e5 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -63,7 +63,7 @@ BUILT_SOURCES += \
63 $(efl_eolian_files_h) \ 63 $(efl_eolian_files_h) \
64 $(efl_eolian_legacy_files_h) 64 $(efl_eolian_legacy_files_h)
65 65
66EXTRA_DIST += \ 66EXTRA_DIST2 += \
67 lib/efl/Efl_Config.h \ 67 lib/efl/Efl_Config.h \
68 lib/efl/Efl_Config.h.in \ 68 lib/efl/Efl_Config.h.in \
69 lib/efl/Efl.h \ 69 lib/efl/Efl.h \
diff --git a/src/Makefile_Efl_Js.am b/src/Makefile_Efl_Js.am
index c273a3e759..a896336188 100644
--- a/src/Makefile_Efl_Js.am
+++ b/src/Makefile_Efl_Js.am
@@ -12,7 +12,7 @@ eflnodedir = $(libdir)/node_modules
12eflnode_DATA = $(top_builddir)/src/lib/efl_js/efl.node 12eflnode_DATA = $(top_builddir)/src/lib/efl_js/efl.node
13 13
14CLEANFILES += ${eflnodedir_DATA} 14CLEANFILES += ${eflnodedir_DATA}
15EXTRA_DIST += ${eflnodedir_DATA} 15EXTRA_DIST2 += ${eflnodedir_DATA}
16 16
17efljsmimedir = @XDG_DATA_HOME@/mime/packages 17efljsmimedir = @XDG_DATA_HOME@/mime/packages
18efljsmime_DATA = bin/efl_js/efljslaunch.xml 18efljsmime_DATA = bin/efl_js/efljslaunch.xml
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 092ca77568..32d433016d 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -221,7 +221,7 @@ tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
221 221
222endif 222endif
223 223
224EXTRA_DIST += \ 224EXTRA_DIST2 += \
225tests/efreet/data/entry \ 225tests/efreet/data/entry \
226tests/efreet/data/entry.png \ 226tests/efreet/data/entry.png \
227tests/efreet/data/long.ini \ 227tests/efreet/data/long.ini \
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index e4e3081415..1b6bdff7bd 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -357,7 +357,7 @@ tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
357 357
358endif 358endif
359 359
360EXTRA_DIST += \ 360EXTRA_DIST2 += \
361lib/eina/eina_strbuf_template_c.x \ 361lib/eina/eina_strbuf_template_c.x \
362lib/eina/eina_binbuf_template_c.x \ 362lib/eina/eina_binbuf_template_c.x \
363lib/eina/eina_inline_private.h \ 363lib/eina/eina_inline_private.h \
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index e3a7a8ba22..a2ca1aa01c 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -15,7 +15,7 @@ eioeolianfilesdir = $(datadir)/eolian/include/eio-@VMAJ@
15eioeolianfiles_DATA = $(eio_eolian_files) 15eioeolianfiles_DATA = $(eio_eolian_files)
16 16
17lib_LTLIBRARIES += lib/eio/libeio.la 17lib_LTLIBRARIES += lib/eio/libeio.la
18EXTRA_DIST += \ 18EXTRA_DIST2 += \
19$(eioeolianfiles_DATA) \ 19$(eioeolianfiles_DATA) \
20lib/eio/Makefile.am \ 20lib/eio/Makefile.am \
21lib/eio/Makefile.in 21lib/eio/Makefile.in
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index 93b0781b4f..7ea34e4e27 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -24,7 +24,7 @@ eldbuseolianfilesdir = $(datadir)/eolian/include/eldbus-@VMAJ@
24eldbuseolianfiles_DATA = $(eldbus_eolian_files) \ 24eldbuseolianfiles_DATA = $(eldbus_eolian_files) \
25 $(eldbus_eolian_type_files) 25 $(eldbus_eolian_type_files)
26 26
27EXTRA_DIST += \ 27EXTRA_DIST2 += \
28 ${eldbuseolianfiles_DATA} 28 ${eldbuseolianfiles_DATA}
29 29
30lib_LTLIBRARIES += lib/eldbus/libeldbus.la 30lib_LTLIBRARIES += lib/eldbus/libeldbus.la
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index eecee5b48e..fee53728ab 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -172,7 +172,7 @@ elementaryeolianfiles_DATA = $(elm_public_eolian_files) $(elm_eolian_type_files)
172 172
173noinst_DATA += $(elm_legacy_eolian_eo_h) 173noinst_DATA += $(elm_legacy_eolian_eo_h)
174 174
175EXTRA_DIST += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) 175EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files)
176 176
177lib_LTLIBRARIES += lib/elementary/libelementary.la 177lib_LTLIBRARIES += lib/elementary/libelementary.la
178 178
@@ -716,7 +716,7 @@ lib_elementary_libelementary_la_CPPFLAGS += \
716-DPOSIX_MISTAKE 716-DPOSIX_MISTAKE
717endif 717endif
718 718
719EXTRA_DIST += \ 719EXTRA_DIST2 += \
720 lib/elementary/elm_factory.h \ 720 lib/elementary/elm_factory.h \
721 lib/elementary/elm_factory.c \ 721 lib/elementary/elm_factory.c \
722 $(top_srcdir)/elm_intro.h.in 722 $(top_srcdir)/elm_intro.h.in
@@ -968,7 +968,7 @@ bin_elementary_elementary_run_LDFLAGS =
968endif 968endif
969endif 969endif
970 970
971EXTRA_DIST += \ 971EXTRA_DIST2 += \
972bin/elementary/test_factory.c 972bin/elementary/test_factory.c
973 973
974### Modules 974### Modules
@@ -1033,7 +1033,7 @@ modules_elementary_datetime_input_ctxpopup_module_la_LIBTOOLFLAGS = --tag=disabl
1033moduleprefspkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH) 1033moduleprefspkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
1034moduleprefspkg_LTLIBRARIES = modules/elementary/prefs/module.la 1034moduleprefspkg_LTLIBRARIES = modules/elementary/prefs/module.la
1035 1035
1036EXTRA_DIST += modules/elementary/prefs/elm_prefs_swallow.edc 1036EXTRA_DIST2 += modules/elementary/prefs/elm_prefs_swallow.edc
1037 1037
1038prefs_filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH) 1038prefs_filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
1039prefs_files_DATA = modules/elementary/prefs/elm_prefs_swallow.edj 1039prefs_files_DATA = modules/elementary/prefs/elm_prefs_swallow.edj
@@ -1161,7 +1161,7 @@ elm_web_none_eolian_files = modules/elementary/web/none/elm_web_none.eo
1161elm_web_none_eolian_c = $(elm_web_none_eolian_files:%.eo=%.eo.c) 1161elm_web_none_eolian_c = $(elm_web_none_eolian_files:%.eo=%.eo.c)
1162elm_web_none_eolian_h = $(elm_web_none_eolian_files:%.eo=%.eo.h) 1162elm_web_none_eolian_h = $(elm_web_none_eolian_files:%.eo=%.eo.h)
1163 1163
1164EXTRA_DIST += $(elm_web_none_eolian_files) 1164EXTRA_DIST2 += $(elm_web_none_eolian_files)
1165BUILT_SOURCES += $(elm_web_none_eolian_c) $(elm_web_none_eolian_h) 1165BUILT_SOURCES += $(elm_web_none_eolian_c) $(elm_web_none_eolian_h)
1166 1166
1167modules_elementary_web_none_module_la_SOURCES = \ 1167modules_elementary_web_none_module_la_SOURCES = \
@@ -1255,7 +1255,7 @@ edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
1255edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static 1255edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static
1256 1256
1257### Tests 1257### Tests
1258EXTRA_DIST += \ 1258EXTRA_DIST2 += \
1259tests/elementary/testfile.txt \ 1259tests/elementary/testfile.txt \
1260tests/elementary/testfile-windows.txt \ 1260tests/elementary/testfile-windows.txt \
1261tests/elementary/testfile-withblanks.txt \ 1261tests/elementary/testfile-withblanks.txt \
@@ -1392,7 +1392,7 @@ elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh)
1392elementary_eolian_cxx_impl = $(elm_public_eolian_files:%.eo=%.eo.impl.hh) 1392elementary_eolian_cxx_impl = $(elm_public_eolian_files:%.eo=%.eo.impl.hh)
1393endif 1393endif
1394 1394
1395EXTRA_DIST += \ 1395EXTRA_DIST2 += \
1396tests/elementary/elm_suite.h \ 1396tests/elementary/elm_suite.h \
1397tests/elementary/elm_test_helper.h \ 1397tests/elementary/elm_test_helper.h \
1398lib/elementary/Makefile.am \ 1398lib/elementary/Makefile.am \
diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
index 7b15e6ea9f..dca4a4d3ae 100644
--- a/src/Makefile_Elua.am
+++ b/src/Makefile_Elua.am
@@ -59,7 +59,7 @@ eluaappsdir = $(datadir)/elua/apps
59eluaapps_DATA = \ 59eluaapps_DATA = \
60 scripts/elua/apps/lualian.lua 60 scripts/elua/apps/lualian.lua
61 61
62EXTRA_DIST += $(eluaapps_DATA) 62EXTRA_DIST2 += $(eluaapps_DATA)
63 63
64eluadocgendir = $(datadir)/elua/apps/docgen 64eluadocgendir = $(datadir)/elua/apps/docgen
65 65
@@ -67,7 +67,7 @@ eluadocgen_DATA = \
67 scripts/elua/apps/docgen/gendoc.lua \ 67 scripts/elua/apps/docgen/gendoc.lua \
68 scripts/elua/apps/docgen/README.md 68 scripts/elua/apps/docgen/README.md
69 69
70EXTRA_DIST += $(eluadocgen_DATA) 70EXTRA_DIST2 += $(eluadocgen_DATA)
71 71
72eluamodulesdir = $(datadir)/elua/modules 72eluamodulesdir = $(datadir)/elua/modules
73 73
@@ -78,7 +78,7 @@ eluamodules_DATA = \
78 bindings/luajit/eo.lua \ 78 bindings/luajit/eo.lua \
79 bindings/luajit/eolian.lua 79 bindings/luajit/eolian.lua
80 80
81EXTRA_DIST += $(eluamodules_DATA) 81EXTRA_DIST2 += $(eluamodules_DATA)
82 82
83eluaeinadir = $(eluamodulesdir)/eina 83eluaeinadir = $(eluamodulesdir)/eina
84 84
@@ -94,7 +94,7 @@ eluaeina_DATA = \
94 bindings/luajit/eina/tiler.lua \ 94 bindings/luajit/eina/tiler.lua \
95 bindings/luajit/eina/xattr.lua 95 bindings/luajit/eina/xattr.lua
96 96
97EXTRA_DIST += $(eluaeina_DATA) 97EXTRA_DIST2 += $(eluaeina_DATA)
98 98
99eluacoredir = $(datadir)/elua/core 99eluacoredir = $(datadir)/elua/core
100 100
@@ -103,7 +103,7 @@ eluacore_DATA = \
103 scripts/elua/core/module.lua \ 103 scripts/elua/core/module.lua \
104 scripts/elua/core/util.lua 104 scripts/elua/core/util.lua
105 105
106EXTRA_DIST += $(eluacore_DATA) 106EXTRA_DIST2 += $(eluacore_DATA)
107 107
108if EFL_ENABLE_TESTS 108if EFL_ENABLE_TESTS
109 109
@@ -138,6 +138,6 @@ tests_elua_elua_suite_DEPENDENCIES = @USE_ELUA_INTERNAL_LIBS@
138 138
139endif 139endif
140 140
141EXTRA_DIST += tests/elua/data/apps/test.lua 141EXTRA_DIST2 += tests/elua/data/apps/test.lua
142 142
143endif 143endif
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 05800f957b..c31fb10f1e 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -60,6 +60,6 @@ bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@
60endif 60endif
61bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@ 61bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
62 62
63EXTRA_DIST += \ 63EXTRA_DIST2 += \
64bin/embryo/embryo_cc_sc5.scp \ 64bin/embryo/embryo_cc_sc5.scp \
65bin/embryo/embryo_cc_sc7.scp 65bin/embryo/embryo_cc_sc7.scp
diff --git a/src/Makefile_Emile.am b/src/Makefile_Emile.am
index 9e580a7632..2d35746b5a 100644
--- a/src/Makefile_Emile.am
+++ b/src/Makefile_Emile.am
@@ -60,7 +60,7 @@ if ENABLE_LIBLZ4
60lib_emile_libemile_la_LIBADD += @LIBLZ4_LIBS@ 60lib_emile_libemile_la_LIBADD += @LIBLZ4_LIBS@
61endif 61endif
62 62
63EXTRA_DIST += static_libs/lz4/README.md \ 63EXTRA_DIST2 += static_libs/lz4/README.md \
64static_libs/lz4/LICENSE \ 64static_libs/lz4/LICENSE \
65static_libs/lz4/NEWS \ 65static_libs/lz4/NEWS \
66static_libs/lz4/lz4.c \ 66static_libs/lz4/lz4.c \
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 69f38e3f3c..653f6d2193 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -15,7 +15,7 @@ emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@
15emotioneolianfiles_DATA = \ 15emotioneolianfiles_DATA = \
16 $(emotion_eolian_files) 16 $(emotion_eolian_files)
17 17
18EXTRA_DIST += \ 18EXTRA_DIST2 += \
19 ${emotioneolianfiles_DATA} 19 ${emotioneolianfiles_DATA}
20 20
21lib_LTLIBRARIES += \ 21lib_LTLIBRARIES += \
@@ -300,7 +300,7 @@ endif
300 300
301# Those probably should be in the if block, but then 301# Those probably should be in the if block, but then
302# "make distcheck" would not work 302# "make distcheck" would not work
303EXTRA_DIST += \ 303EXTRA_DIST2 += \
304tests/emotion/data/bpause.png \ 304tests/emotion/data/bpause.png \
305tests/emotion/data/bplay.png \ 305tests/emotion/data/bplay.png \
306tests/emotion/data/bstop.png \ 306tests/emotion/data/bstop.png \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 2d7d083cd9..a7c9cf2875 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -42,7 +42,7 @@ eoeolianfiles_DATA = \
42 $(eo_eolian_files) \ 42 $(eo_eolian_files) \
43 lib/eo/eina_types.eot # We don't generate .c/.h on purpose 43 lib/eo/eina_types.eot # We don't generate .c/.h on purpose
44 44
45EXTRA_DIST += lib/eo/Makefile.am \ 45EXTRA_DIST2 += lib/eo/Makefile.am \
46 lib/eo/Makefile.in \ 46 lib/eo/Makefile.in \
47 ${eoeolianfiles_DATA} 47 ${eoeolianfiles_DATA}
48 48
@@ -210,7 +210,7 @@ TESTS += tests/eo/test_signals
210endif 210endif
211 211
212 212
213EXTRA_DIST += tests/eo/eunit_tests.h lib/eo/eo_ptr_indirection.x 213EXTRA_DIST2 += tests/eo/eunit_tests.h lib/eo/eo_ptr_indirection.x
214 214
215if HAVE_JS 215if HAVE_JS
216 216
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index 00773be736..164495bc0e 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -133,7 +133,7 @@ tests_eolian_eolian_suite.$(OBJEXT): $(EOLIAN_TESTS_EOS_GENERATED)
133 133
134endif 134endif
135 135
136EXTRA_DIST += \ 136EXTRA_DIST2 += \
137tests/eolian/data/object_impl_ref.c \ 137tests/eolian/data/object_impl_ref.c \
138tests/eolian/data/object_impl_add_ref.c \ 138tests/eolian/data/object_impl_add_ref.c \
139tests/eolian/data/typedef_ref.c \ 139tests/eolian/data/typedef_ref.c \
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 981cca5bb2..b8fad1cf4a 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -169,7 +169,7 @@ tests_eolian_cxx_eolian_cxx_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
169 169
170endif 170endif
171 171
172EXTRA_DIST += \ 172EXTRA_DIST2 += \
173tests/eolian_cxx/simple.eo \ 173tests/eolian_cxx/simple.eo \
174tests/eolian_cxx/generic.eo \ 174tests/eolian_cxx/generic.eo \
175tests/eolian_cxx/a.eo \ 175tests/eolian_cxx/a.eo \
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 2f4b7de5e6..a73e7a9a0f 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -62,7 +62,7 @@ modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules
62ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj 62ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj
63CLEANFILES += modules/ethumb/emotion/template.edj 63CLEANFILES += modules/ethumb/emotion/template.edj
64 64
65EXTRA_DIST += \ 65EXTRA_DIST2 += \
66modules/ethumb/emotion/template.edc \ 66modules/ethumb/emotion/template.edc \
67modules/ethumb/emotion/placeholder.png 67modules/ethumb/emotion/placeholder.png
68endif 68endif
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 50447a7c46..ff099f5043 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -88,7 +88,7 @@ BUILT_SOURCES += \
88evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@ 88evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
89evaseolianfiles_DATA = $(evas_eolian_files) 89evaseolianfiles_DATA = $(evas_eolian_files)
90 90
91EXTRA_DIST += \ 91EXTRA_DIST2 += \
92 $(evaseolianfiles_DATA) \ 92 $(evaseolianfiles_DATA) \
93 $(evas_eolian_internal_files) 93 $(evas_eolian_internal_files)
94 94
@@ -205,7 +205,7 @@ lib/evas/canvas/efl_event_key.c \
205lib/evas/canvas/efl_event_pointer.c \ 205lib/evas/canvas/efl_event_pointer.c \
206$(NULL) 206$(NULL)
207 207
208EXTRA_DIST += \ 208EXTRA_DIST2 += \
209lib/evas/canvas/render2/evas_render2_th_main.c \ 209lib/evas/canvas/render2/evas_render2_th_main.c \
210lib/evas/canvas/render2/region.c \ 210lib/evas/canvas/render2/region.c \
211lib/evas/canvas/render2/region.h 211lib/evas/canvas/render2/region.h
@@ -456,7 +456,7 @@ lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
456 456
457# Linebreak 457# Linebreak
458 458
459EXTRA_DIST += \ 459EXTRA_DIST2 += \
460static_libs/libunibreak/LICENCE \ 460static_libs/libunibreak/LICENCE \
461static_libs/libunibreak/AUTHORS \ 461static_libs/libunibreak/AUTHORS \
462static_libs/libunibreak/NEWS \ 462static_libs/libunibreak/NEWS \
@@ -465,7 +465,7 @@ static_libs/libunibreak/ChangeLog
465 465
466# Engines 466# Engines
467 467
468EXTRA_DIST += \ 468EXTRA_DIST2 += \
469lib/evas/common/evas_font_compress_draw.c \ 469lib/evas/common/evas_font_compress_draw.c \
470lib/evas/common/evas_map_image_internal.c \ 470lib/evas/common/evas_map_image_internal.c \
471lib/evas/common/evas_map_image_core.c \ 471lib/evas/common/evas_map_image_core.c \
@@ -481,7 +481,7 @@ lib/evas/common/evas_scale_smooth_scaler_up.c
481 481
482# evas_op_add 482# evas_op_add
483 483
484EXTRA_DIST += \ 484EXTRA_DIST2 += \
485lib/evas/common/evas_op_add/op_add_color_.c \ 485lib/evas/common/evas_op_add/op_add_color_.c \
486lib/evas/common/evas_op_add/op_add_color_i386.c \ 486lib/evas/common/evas_op_add/op_add_color_i386.c \
487lib/evas/common/evas_op_add/op_add_mask_color_.c \ 487lib/evas/common/evas_op_add/op_add_mask_color_.c \
@@ -495,7 +495,7 @@ lib/evas/common/evas_op_add/op_add_pixel_mask_i386.c
495 495
496# evas_op_blend 496# evas_op_blend
497 497
498EXTRA_DIST += \ 498EXTRA_DIST2 += \
499lib/evas/common/evas_op_blend/op_blend_color_.c \ 499lib/evas/common/evas_op_blend/op_blend_color_.c \
500lib/evas/common/evas_op_blend/op_blend_color_i386.c \ 500lib/evas/common/evas_op_blend/op_blend_color_i386.c \
501lib/evas/common/evas_op_blend/op_blend_color_neon.c \ 501lib/evas/common/evas_op_blend/op_blend_color_neon.c \
@@ -519,7 +519,7 @@ lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
519 519
520# evas_op_copy 520# evas_op_copy
521 521
522EXTRA_DIST += \ 522EXTRA_DIST2 += \
523lib/evas/common/evas_op_copy/op_copy_color_.c \ 523lib/evas/common/evas_op_copy/op_copy_color_.c \
524lib/evas/common/evas_op_copy/op_copy_color_i386.c \ 524lib/evas/common/evas_op_copy/op_copy_color_i386.c \
525lib/evas/common/evas_op_copy/op_copy_color_neon.c \ 525lib/evas/common/evas_op_copy/op_copy_color_neon.c \
@@ -538,7 +538,7 @@ lib/evas/common/evas_op_copy/op_copy_pixel_mask_neon.c
538 538
539# evas_op_mask 539# evas_op_mask
540 540
541EXTRA_DIST += \ 541EXTRA_DIST2 += \
542lib/evas/common/evas_op_mask/op_mask_color_.c \ 542lib/evas/common/evas_op_mask/op_mask_color_.c \
543lib/evas/common/evas_op_mask/op_mask_color_i386.c \ 543lib/evas/common/evas_op_mask/op_mask_color_i386.c \
544lib/evas/common/evas_op_mask/op_mask_mask_color_.c \ 544lib/evas/common/evas_op_mask/op_mask_mask_color_.c \
@@ -552,7 +552,7 @@ lib/evas/common/evas_op_mask/op_mask_pixel_mask_i386.c
552 552
553# evas_op_mul 553# evas_op_mul
554 554
555EXTRA_DIST += \ 555EXTRA_DIST2 += \
556lib/evas/common/evas_op_mul/op_mul_color_.c \ 556lib/evas/common/evas_op_mul/op_mul_color_.c \
557lib/evas/common/evas_op_mul/op_mul_color_i386.c \ 557lib/evas/common/evas_op_mul/op_mul_color_i386.c \
558lib/evas/common/evas_op_mul/op_mul_mask_color_.c \ 558lib/evas/common/evas_op_mul/op_mul_mask_color_.c \
@@ -566,7 +566,7 @@ lib/evas/common/evas_op_mul/op_mul_pixel_mask_i386.c
566 566
567# evas_op_sub 567# evas_op_sub
568 568
569EXTRA_DIST += \ 569EXTRA_DIST2 += \
570lib/evas/common/evas_op_sub/op_sub_color_.c \ 570lib/evas/common/evas_op_sub/op_sub_color_.c \
571lib/evas/common/evas_op_sub/op_sub_color_i386.c \ 571lib/evas/common/evas_op_sub/op_sub_color_i386.c \
572lib/evas/common/evas_op_sub/op_sub_mask_color_.c \ 572lib/evas/common/evas_op_sub/op_sub_mask_color_.c \
@@ -596,7 +596,7 @@ lib/evas/filters/evas_filter_transform.c \
596lib/evas/filters/evas_filter_utils.c \ 596lib/evas/filters/evas_filter_utils.c \
597lib/evas/filters/evas_filter_private.h 597lib/evas/filters/evas_filter_private.h
598 598
599EXTRA_DIST += \ 599EXTRA_DIST2 += \
600lib/evas/filters/blur/blur_gaussian_alpha_.c \ 600lib/evas/filters/blur/blur_gaussian_alpha_.c \
601lib/evas/filters/blur/blur_gaussian_rgba_.c \ 601lib/evas/filters/blur/blur_gaussian_rgba_.c \
602lib/evas/filters/blur/blur_box_alpha_.c \ 602lib/evas/filters/blur/blur_box_alpha_.c \
@@ -614,7 +614,7 @@ lib/evas/filters/blur/blur_box_rgba_neon.c
614evas_software_generic_eolian_files = \ 614evas_software_generic_eolian_files = \
615modules/evas/engines/software_generic/evas_ector_software_buffer.eo 615modules/evas/engines/software_generic/evas_ector_software_buffer.eo
616 616
617EXTRA_DIST += $(evas_software_generic_eolian_files) 617EXTRA_DIST2 += $(evas_software_generic_eolian_files)
618 618
619evas_software_generic_eolian_c = $(evas_software_generic_eolian_files:%.eo=%.eo.c) 619evas_software_generic_eolian_c = $(evas_software_generic_eolian_files:%.eo=%.eo.c)
620evas_software_generic_eolian_h = $(evas_software_generic_eolian_files:%.eo=%.eo.h) 620evas_software_generic_eolian_h = $(evas_software_generic_eolian_files:%.eo=%.eo.h)
@@ -771,7 +771,7 @@ modules/evas/engines/gl_common/shader/vertex.glsl \
771modules/evas/engines/gl_common/shader/include.glsl \ 771modules/evas/engines/gl_common/shader/include.glsl \
772$(NULL) 772$(NULL)
773 773
774EXTRA_DIST += $(EVAS_GL_SHADERS_GEN) 774EXTRA_DIST2 += $(EVAS_GL_SHADERS_GEN)
775 775
776modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN) 776modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN)
777 @echo " SHADERS $@" 777 @echo " SHADERS $@"
@@ -799,7 +799,7 @@ modules/evas/engines/gl_common/shader_3d/post_processing_fxaa_vert.shd \
799modules/evas/engines/gl_common/shader_3d/post_processing_fxaa_frag.shd \ 799modules/evas/engines/gl_common/shader_3d/post_processing_fxaa_frag.shd \
800$(NULL) 800$(NULL)
801 801
802EXTRA_DIST += \ 802EXTRA_DIST2 += \
803modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh \ 803modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh \
804$(GL_SHADERS_3D_GEN) 804$(GL_SHADERS_3D_GEN)
805 805
@@ -831,7 +831,7 @@ BUILT_SOURCES += \
831 $(evas_gl_generic_eolian_c) \ 831 $(evas_gl_generic_eolian_c) \
832 $(evas_gl_generic_eolian_h) 832 $(evas_gl_generic_eolian_h)
833 833
834EXTRA_DIST += $(evas_gl_generic_eolian_files) 834EXTRA_DIST2 += $(evas_gl_generic_eolian_files)
835 835
836#evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@ 836#evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
837#evaseolianfiles_DATA += $(evas_gl_generic_eolian_files) 837#evaseolianfiles_DATA += $(evas_gl_generic_eolian_files)
@@ -2127,7 +2127,7 @@ endif
2127endif 2127endif
2128 2128
2129if BUILD_LOADER_TGV 2129if BUILD_LOADER_TGV
2130EXTRA_DIST += static_libs/rg_etc/README 2130EXTRA_DIST2 += static_libs/rg_etc/README
2131if EVAS_STATIC_BUILD_TGV 2131if EVAS_STATIC_BUILD_TGV
2132lib_evas_libevas_la_SOURCES += \ 2132lib_evas_libevas_la_SOURCES += \
2133modules/evas/image_loaders/tgv/evas_image_load_tgv.c \ 2133modules/evas/image_loaders/tgv/evas_image_load_tgv.c \
@@ -2282,7 +2282,7 @@ tests_evas_evas_suite_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@ @USE_ECORE_EVAS_LIBS@
2282tests_evas_evas_suite_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@ 2282tests_evas_evas_suite_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
2283endif 2283endif
2284 2284
2285EXTRA_DIST += \ 2285EXTRA_DIST2 += \
2286tests/evas/TestFont.eet \ 2286tests/evas/TestFont.eet \
2287tests/evas/images/HM7Y9233-50.tgv \ 2287tests/evas/images/HM7Y9233-50.tgv \
2288tests/evas/images/HM7Y9233.jpg \ 2288tests/evas/images/HM7Y9233.jpg \
@@ -2378,7 +2378,7 @@ evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh)
2378evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh) 2378evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh)
2379endif 2379endif
2380 2380
2381EXTRA_DIST += \ 2381EXTRA_DIST2 += \
2382generic/evas/common/shmfile.c \ 2382generic/evas/common/shmfile.c \
2383generic/evas/common/shmfile.h \ 2383generic/evas/common/shmfile.h \
2384generic/evas/common/timeout.c \ 2384generic/evas/common/timeout.c \
@@ -2391,7 +2391,7 @@ evasgenericloaders_PROGRAMS =
2391evasgenericloaders_SCRIPT = 2391evasgenericloaders_SCRIPT =
2392 2392
2393### Libreoffice converter to pdf 2393### Libreoffice converter to pdf
2394EXTRA_DIST += generic/evas/pdf/evas_generic_pdf_loader.libreoffice 2394EXTRA_DIST2 += generic/evas/pdf/evas_generic_pdf_loader.libreoffice
2395 2395
2396if HAVE_POPPLER 2396if HAVE_POPPLER
2397 2397
@@ -2527,7 +2527,7 @@ ln -sf evas_image_loader.svg $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.sv
2527 2527
2528endif 2528endif
2529 2529
2530EXTRA_DIST += generic/evas/xcf/common.h 2530EXTRA_DIST2 += generic/evas/xcf/common.h
2531 2531
2532evasgenericloaders_PROGRAMS += generic/evas/xcf/evas_image_loader.xcf 2532evasgenericloaders_PROGRAMS += generic/evas/xcf/evas_image_loader.xcf
2533 2533
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 54089682de..68830cb849 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -107,7 +107,7 @@ bin/evil/evil_test_realpath.h \
107bin/evil/evil_test_util.h 107bin/evil/evil_test_util.h
108 108
109 109
110#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below! 110#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST2 below!
111 111
112bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@ 112bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@
113bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ -lm 113bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ -lm
@@ -144,7 +144,7 @@ endif
144 144
145endif 145endif
146 146
147EXTRA_DIST += \ 147EXTRA_DIST2 += \
148lib/evil/regex/regerror.ih \ 148lib/evil/regex/regerror.ih \
149lib/evil/regex/engine.ih \ 149lib/evil/regex/engine.ih \
150lib/evil/regex/regcomp.ih \ 150lib/evil/regex/regcomp.ih \