summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore.am
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 /src/Makefile_Ecore.am
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.
Diffstat (limited to 'src/Makefile_Ecore.am')
-rw-r--r--src/Makefile_Ecore.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 83f5407..b9c83f5 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