aboutsummaryrefslogtreecommitdiffstats
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
parentEvas: Rename Zoomable_Interface to Efl.Ui.Zoomable (diff)
downloadefl-93eadd76d6d49bbe1e49eaf976b4c6fd5545f340.tar.gz
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 =
noinst_PROGRAMS =
check_PROGRAMS =
TESTS =
-EXTRA_DIST =
+EXTRA_DIST2 =
noinst_LTLIBRARIES =
noinst_DATA =
@@ -160,6 +160,20 @@ install-examples:
$(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \
done
+dist-hook:
+ @mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data
+ @mkdir -p $(distdir)/tests/evas/images $(distdir)/tests/evas/meshes
+ @mkdir -p $(distdir)/tests/efreet/data $(distdir)/tests/edje/data
+ @mkdir -p $(distdir)/tests/emotion/data $(distdir)/tests/evas/meshes/md2
+ @mkdir -p $(distdir)/tests/evas/meshes/obj $(distdir)/tests/efreet/data/sub
+ @mkdir -p $(distdir)/scripts/eina $(distdir)/scripts/elua/modules
+ @mkdir -p $(distdir)/scripts/elua/core $(distdir)/scripts/elua/apps/docgen
+ @mkdir -p $(distdir)/lib/evas/common/evas_op_add $(distdir)/lib/evas/common/evas_op_copy
+ @mkdir -p $(distdir)/lib/evas/common/evas_op_mask $(distdir)/lib/evas/common/evas_op_mul
+ @mkdir -p $(distdir)/lib/evas/common/evas_op_sub $(distdir)/lib/evas/filters/blur
+ @mkdir -p $(distdir)/static_libs/http-parser/contrib $(distdir)/bindings/luajit/eina
+ for F in $(EXTRA_DIST2); do cp -f $(srcdir)/$$F $(distdir)/$$F; done
+
clean-local:
find . -type f -name '*.gcno' -delete
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 \
tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ @USE_EO_LIBS@
tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ @USE_EO_INTERNAL_LIBS@
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/eina_cxx/simple.eo
### 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@
ecoreeolianfiles_DATA = $(ecore_eolian_files) \
$(ecore_eolian_type_files)
-EXTRA_DIST += lib/ecore/Makefile.am \
+EXTRA_DIST2 += lib/ecore/Makefile.am \
lib/ecore/Makefile.in \
${ecoreeolianfiles_DATA}
@@ -77,7 +77,7 @@ lib/ecore/ecore_private.h
if HAVE_WIN32
lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_exe_win32.c
else
-EXTRA_DIST += lib/ecore/ecore_exe_ps3.c
+EXTRA_DIST2 += lib/ecore/ecore_exe_ps3.c
#if ECORE_HAVE_PS3
#libecore_la_SOURCES += ecore_exe_ps3.c
#else
@@ -262,7 +262,7 @@ endif
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/ecore/sample.wav \
tests/ecore/sample.ogg
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 += \
ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
${ecore_audioeolianfiles_DATA}
lib_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@
ecoreconeolianfiles_DATA = \
$(ecore_con_eolian_files)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
${ecoreconeolianfiles_DATA}
lib_LTLIBRARIES += lib/ecore_con/libecore_con.la
@@ -54,7 +54,7 @@ static_libs/http-parser/http_parser.h \
lib/ecore_con/ecore_con_private.h \
lib/ecore_con/ecore_con_info.c
-EXTRA_DIST += lib/ecore_con/ecore_con_legacy.c
+EXTRA_DIST2 += lib/ecore_con/ecore_con_legacy.c
if HAVE_WINDOWS
lib_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@
lib_ecore_con_libecore_con_la_CPPFLAGS += -I$(top_srcdir)/src/static_libs/http-parser
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/ecore_con/server.key \
tests/ecore_con/server.pem \
static_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@
endif
# TODO: what are they used for?
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/ecore_psl1ght/gemutil.c \
lib/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
utils_ecore_makekeys_CFLAGS = @ECORE_X_CFLAGS@
endif
-EXTRA_DIST += utils/ecore/mkks.sh
+EXTRA_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 += \
ectoreolianfilesdir = $(datadir)/eolian/include/ector-@VMAJ@
ectoreolianfiles_DATA = $(ector_eolian_files) $(ector_eolian_type_files)
-EXTRA_DIST += $(ectoreolianfiles_DATA) \
+EXTRA_DIST2 += $(ectoreolianfiles_DATA) \
lib/ector/Makefile.am \
lib/ector/Makefile.in \
lib/ector/Ector.h \
@@ -195,7 +195,7 @@ tests_ector_ector_suite_DEPENDENCIES = @USE_ECTOR_INTERNAL_LIBS@
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/ector/ector_private.h \
lib/ector/cairo/ector_cairo_private.h \
lib/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 = \
noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h)
-EXTRA_DIST += lib/edje/Makefile.am \
+EXTRA_DIST2 += lib/edje/Makefile.am \
lib/edje/Makefile.in \
${edjeeolianfiles_DATA} \
$(edje_eolian_priv_files)
@@ -256,7 +256,7 @@ bin_edje_epp_epp_LDADD = lib/evil/libevil.la
endif
# TODO: why keep these?
-EXTRA_DIST += \
+EXTRA_DIST2 += \
bin/edje/edje_convert.h \
bin/edje/edje_convert.c \
bin/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@
tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/eet/cert.pem \
tests/eet/key_enc_none.pem \
tests/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 += \
$(efl_eolian_files_h) \
$(efl_eolian_legacy_files_h)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/efl/Efl_Config.h \
lib/efl/Efl_Config.h.in \
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
eflnode_DATA = $(top_builddir)/src/lib/efl_js/efl.node
CLEANFILES += ${eflnodedir_DATA}
-EXTRA_DIST += ${eflnodedir_DATA}
+EXTRA_DIST2 += ${eflnodedir_DATA}
efljsmimedir = @XDG_DATA_HOME@/mime/packages
efljsmime_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@
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/efreet/data/entry \
tests/efreet/data/entry.png \
tests/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
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/eina/eina_strbuf_template_c.x \
lib/eina/eina_binbuf_template_c.x \
lib/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@
eioeolianfiles_DATA = $(eio_eolian_files)
lib_LTLIBRARIES += lib/eio/libeio.la
-EXTRA_DIST += \
+EXTRA_DIST2 += \
$(eioeolianfiles_DATA) \
lib/eio/Makefile.am \
lib/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@
eldbuseolianfiles_DATA = $(eldbus_eolian_files) \
$(eldbus_eolian_type_files)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
${eldbuseolianfiles_DATA}
lib_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)
noinst_DATA += $(elm_legacy_eolian_eo_h)
-EXTRA_DIST += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files)
+EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files)
lib_LTLIBRARIES += lib/elementary/libelementary.la
@@ -716,7 +716,7 @@ lib_elementary_libelementary_la_CPPFLAGS += \
-DPOSIX_MISTAKE
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/elementary/elm_factory.h \
lib/elementary/elm_factory.c \
$(top_srcdir)/elm_intro.h.in
@@ -968,7 +968,7 @@ bin_elementary_elementary_run_LDFLAGS =
endif
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
bin/elementary/test_factory.c
### Modules
@@ -1033,7 +1033,7 @@ modules_elementary_datetime_input_ctxpopup_module_la_LIBTOOLFLAGS = --tag=disabl
moduleprefspkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
moduleprefspkg_LTLIBRARIES = modules/elementary/prefs/module.la
-EXTRA_DIST += modules/elementary/prefs/elm_prefs_swallow.edc
+EXTRA_DIST2 += modules/elementary/prefs/elm_prefs_swallow.edc
prefs_filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
prefs_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
elm_web_none_eolian_c = $(elm_web_none_eolian_files:%.eo=%.eo.c)
elm_web_none_eolian_h = $(elm_web_none_eolian_files:%.eo=%.eo.h)
-EXTRA_DIST += $(elm_web_none_eolian_files)
+EXTRA_DIST2 += $(elm_web_none_eolian_files)
BUILT_SOURCES += $(elm_web_none_eolian_c) $(elm_web_none_eolian_h)
modules_elementary_web_none_module_la_SOURCES = \
@@ -1255,7 +1255,7 @@ edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static
### Tests
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/elementary/testfile.txt \
tests/elementary/testfile-windows.txt \
tests/elementary/testfile-withblanks.txt \
@@ -1392,7 +1392,7 @@ elementary_eolian_cxx_hh = $(elm_public_eolian_files:%.eo=%.eo.hh)
elementary_eolian_cxx_impl = $(elm_public_eolian_files:%.eo=%.eo.impl.hh)
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/elementary/elm_suite.h \
tests/elementary/elm_test_helper.h \
lib/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
eluaapps_DATA = \
scripts/elua/apps/lualian.lua
-EXTRA_DIST += $(eluaapps_DATA)
+EXTRA_DIST2 += $(eluaapps_DATA)
eluadocgendir = $(datadir)/elua/apps/docgen
@@ -67,7 +67,7 @@ eluadocgen_DATA = \
scripts/elua/apps/docgen/gendoc.lua \
scripts/elua/apps/docgen/README.md
-EXTRA_DIST += $(eluadocgen_DATA)
+EXTRA_DIST2 += $(eluadocgen_DATA)
eluamodulesdir = $(datadir)/elua/modules
@@ -78,7 +78,7 @@ eluamodules_DATA = \
bindings/luajit/eo.lua \
bindings/luajit/eolian.lua
-EXTRA_DIST += $(eluamodules_DATA)
+EXTRA_DIST2 += $(eluamodules_DATA)
eluaeinadir = $(eluamodulesdir)/eina
@@ -94,7 +94,7 @@ eluaeina_DATA = \
bindings/luajit/eina/tiler.lua \
bindings/luajit/eina/xattr.lua
-EXTRA_DIST += $(eluaeina_DATA)
+EXTRA_DIST2 += $(eluaeina_DATA)
eluacoredir = $(datadir)/elua/core
@@ -103,7 +103,7 @@ eluacore_DATA = \
scripts/elua/core/module.lua \
scripts/elua/core/util.lua
-EXTRA_DIST += $(eluacore_DATA)
+EXTRA_DIST2 += $(eluacore_DATA)
if EFL_ENABLE_TESTS
@@ -138,6 +138,6 @@ tests_elua_elua_suite_DEPENDENCIES = @USE_ELUA_INTERNAL_LIBS@
endif
-EXTRA_DIST += tests/elua/data/apps/test.lua
+EXTRA_DIST2 += tests/elua/data/apps/test.lua
endif
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@
endif
bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
-EXTRA_DIST += \
+EXTRA_DIST2 += \
bin/embryo/embryo_cc_sc5.scp \
bin/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
lib_emile_libemile_la_LIBADD += @LIBLZ4_LIBS@
endif
-EXTRA_DIST += static_libs/lz4/README.md \
+EXTRA_DIST2 += static_libs/lz4/README.md \
static_libs/lz4/LICENSE \
static_libs/lz4/NEWS \
static_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@
emotioneolianfiles_DATA = \
$(emotion_eolian_files)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
${emotioneolianfiles_DATA}
lib_LTLIBRARIES += \
@@ -300,7 +300,7 @@ endif
# Those probably should be in the if block, but then
# "make distcheck" would not work
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/emotion/data/bpause.png \
tests/emotion/data/bplay.png \
tests/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 = \
$(eo_eolian_files) \
lib/eo/eina_types.eot # We don't generate .c/.h on purpose
-EXTRA_DIST += lib/eo/Makefile.am \
+EXTRA_DIST2 += lib/eo/Makefile.am \
lib/eo/Makefile.in \
${eoeolianfiles_DATA}
@@ -210,7 +210,7 @@ TESTS += tests/eo/test_signals
endif
-EXTRA_DIST += tests/eo/eunit_tests.h lib/eo/eo_ptr_indirection.x
+EXTRA_DIST2 += tests/eo/eunit_tests.h lib/eo/eo_ptr_indirection.x
if HAVE_JS
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)
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/eolian/data/object_impl_ref.c \
tests/eolian/data/object_impl_add_ref.c \
tests/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@
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/eolian_cxx/simple.eo \
tests/eolian_cxx/generic.eo \
tests/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
ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj
CLEANFILES += modules/ethumb/emotion/template.edj
-EXTRA_DIST += \
+EXTRA_DIST2 += \
modules/ethumb/emotion/template.edc \
modules/ethumb/emotion/placeholder.png
endif
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 += \
evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
evaseolianfiles_DATA = $(evas_eolian_files)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
$(evaseolianfiles_DATA) \
$(evas_eolian_internal_files)
@@ -205,7 +205,7 @@ lib/evas/canvas/efl_event_key.c \
lib/evas/canvas/efl_event_pointer.c \
$(NULL)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/canvas/render2/evas_render2_th_main.c \
lib/evas/canvas/render2/region.c \
lib/evas/canvas/render2/region.h
@@ -456,7 +456,7 @@ lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# Linebreak
-EXTRA_DIST += \
+EXTRA_DIST2 += \
static_libs/libunibreak/LICENCE \
static_libs/libunibreak/AUTHORS \
static_libs/libunibreak/NEWS \
@@ -465,7 +465,7 @@ static_libs/libunibreak/ChangeLog
# Engines
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/common/evas_font_compress_draw.c \
lib/evas/common/evas_map_image_internal.c \
lib/evas/common/evas_map_image_core.c \
@@ -481,7 +481,7 @@ lib/evas/common/evas_scale_smooth_scaler_up.c
# evas_op_add
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/common/evas_op_add/op_add_color_.c \
lib/evas/common/evas_op_add/op_add_color_i386.c \
lib/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
# evas_op_blend
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/common/evas_op_blend/op_blend_color_.c \
lib/evas/common/evas_op_blend/op_blend_color_i386.c \
lib/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
# evas_op_copy
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/common/evas_op_copy/op_copy_color_.c \
lib/evas/common/evas_op_copy/op_copy_color_i386.c \
lib/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
# evas_op_mask
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/common/evas_op_mask/op_mask_color_.c \
lib/evas/common/evas_op_mask/op_mask_color_i386.c \
lib/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
# evas_op_mul
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/common/evas_op_mul/op_mul_color_.c \
lib/evas/common/evas_op_mul/op_mul_color_i386.c \
lib/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
# evas_op_sub
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/common/evas_op_sub/op_sub_color_.c \
lib/evas/common/evas_op_sub/op_sub_color_i386.c \
lib/evas/common/evas_op_sub/op_sub_mask_color_.c \
@@ -596,7 +596,7 @@ lib/evas/filters/evas_filter_transform.c \
lib/evas/filters/evas_filter_utils.c \
lib/evas/filters/evas_filter_private.h
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evas/filters/blur/blur_gaussian_alpha_.c \
lib/evas/filters/blur/blur_gaussian_rgba_.c \
lib/evas/filters/blur/blur_box_alpha_.c \
@@ -614,7 +614,7 @@ lib/evas/filters/blur/blur_box_rgba_neon.c
evas_software_generic_eolian_files = \
modules/evas/engines/software_generic/evas_ector_software_buffer.eo
-EXTRA_DIST += $(evas_software_generic_eolian_files)
+EXTRA_DIST2 += $(evas_software_generic_eolian_files)
evas_software_generic_eolian_c = $(evas_software_generic_eolian_files:%.eo=%.eo.c)
evas_software_generic_eolian_h = $(evas_software_generic_eolian_files:%.eo=%.eo.h)
@@ -771,7 +771,7 @@ modules/evas/engines/gl_common/shader/vertex.glsl \
modules/evas/engines/gl_common/shader/include.glsl \
$(NULL)
-EXTRA_DIST += $(EVAS_GL_SHADERS_GEN)
+EXTRA_DIST2 += $(EVAS_GL_SHADERS_GEN)
modules/evas/engines/gl_common/shader/evas_gl_shaders.x: $(EVAS_GL_SHADERS_GEN)
@echo " SHADERS $@"
@@ -799,7 +799,7 @@ modules/evas/engines/gl_common/shader_3d/post_processing_fxaa_vert.shd \
modules/evas/engines/gl_common/shader_3d/post_processing_fxaa_frag.shd \
$(NULL)
-EXTRA_DIST += \
+EXTRA_DIST2 += \
modules/evas/engines/gl_common/shader_3d/gen_shaders_3d.sh \
$(GL_SHADERS_3D_GEN)
@@ -831,7 +831,7 @@ BUILT_SOURCES += \
$(evas_gl_generic_eolian_c) \
$(evas_gl_generic_eolian_h)
-EXTRA_DIST += $(evas_gl_generic_eolian_files)
+EXTRA_DIST2 += $(evas_gl_generic_eolian_files)
#evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
#evaseolianfiles_DATA += $(evas_gl_generic_eolian_files)
@@ -2127,7 +2127,7 @@ endif
endif
if BUILD_LOADER_TGV
-EXTRA_DIST += static_libs/rg_etc/README
+EXTRA_DIST2 += static_libs/rg_etc/README
if EVAS_STATIC_BUILD_TGV
lib_evas_libevas_la_SOURCES += \
modules/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@
tests_evas_evas_suite_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
tests/evas/TestFont.eet \
tests/evas/images/HM7Y9233-50.tgv \
tests/evas/images/HM7Y9233.jpg \
@@ -2378,7 +2378,7 @@ evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh)
evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh)
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
generic/evas/common/shmfile.c \
generic/evas/common/shmfile.h \
generic/evas/common/timeout.c \
@@ -2391,7 +2391,7 @@ evasgenericloaders_PROGRAMS =
evasgenericloaders_SCRIPT =
### Libreoffice converter to pdf
-EXTRA_DIST += generic/evas/pdf/evas_generic_pdf_loader.libreoffice
+EXTRA_DIST2 += generic/evas/pdf/evas_generic_pdf_loader.libreoffice
if HAVE_POPPLER
@@ -2527,7 +2527,7 @@ ln -sf evas_image_loader.svg $(DESTDIR)$(libdir)/evas/utils/evas_image_loader.sv
endif
-EXTRA_DIST += generic/evas/xcf/common.h
+EXTRA_DIST2 += generic/evas/xcf/common.h
evasgenericloaders_PROGRAMS += generic/evas/xcf/evas_image_loader.xcf
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 \
bin/evil/evil_test_util.h
-#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
+#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST2 below!
bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@
bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ -lm
@@ -144,7 +144,7 @@ endif
endif
-EXTRA_DIST += \
+EXTRA_DIST2 += \
lib/evil/regex/regerror.ih \
lib/evil/regex/engine.ih \
lib/evil/regex/regcomp.ih \