From 0a03e633500466b86cca3b7a5f088735afd7cb56 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 31 Mar 2016 16:22:04 +0200 Subject: [PATCH] build: keep our CLEANFILES tidy to avoid argument list too long during clean We have been putting the generated eo files and BUILT_SOURCES into CLEANFILES several times. So far this have not been a real problem but with the elm merge and more and more eo files showing up this did explode recently. During make distcheck a lot of files kept being around and make complained about them. It took some digging to find the arguments list to long error. If you want details on this great limitation have a look here: http://www.linuxjournal.com/article/6060 In our case we have been lucky enough that we just appened many files over and over again. Not doing that solves the issue for now. My testing showed no problems but if I missed something let me know. Fixes T3386 --- src/Makefile.am | 3 +++ src/Makefile_Ecore.am | 4 ---- src/Makefile_Ecore_Audio.am | 4 ---- src/Makefile_Ecore_Con.am | 4 ---- src/Makefile_Edje.am | 4 ---- src/Makefile_Efl.am | 5 ----- src/Makefile_Elementary.am | 4 ---- src/Makefile_Elua_Helper.am | 2 -- src/Makefile_Emotion.am | 4 ---- src/Makefile_Eolian_Cxx_Helper.am | 2 -- src/Makefile_Eolian_Helper.am | 2 -- src/Makefile_Eolian_Js_Helper.am | 2 -- src/Makefile_Evas.am | 4 ---- 13 files changed, 3 insertions(+), 41 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c256c4f909..da975e226e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -100,6 +100,9 @@ endif include Makefile_Eolian_Js.am include Makefile_Efl_Js.am +# Make sure all generated files getting cleaned up +CLEANFILES += $(BUILT_SOURCES) + .PHONY: benchmark examples BENCHMARK_SUBDIRS = \ diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 49936afffa..e5d5efc981 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -28,10 +28,6 @@ BUILT_SOURCES += \ $(ecore_eolian_c) \ $(ecore_eolian_h) -CLEANFILES += \ - $(ecore_eolian_c) \ - $(ecore_eolian_h) - ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ ecoreeolianfiles_DATA = $(ecore_eolian_files) \ $(ecore_eolian_type_files) diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index b500118736..245ef9cdd9 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -26,10 +26,6 @@ BUILT_SOURCES += \ $(ecore_audio_eolian_c) \ $(ecore_audio_eolian_h) -CLEANFILES += \ - $(ecore_audio_eolian_c) \ - $(ecore_audio_eolian_h) - ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files) diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index 019997564d..154d25b59d 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -19,10 +19,6 @@ BUILT_SOURCES += \ $(ecore_con_eolian_c) \ $(ecore_con_eolian_h) -CLEANFILES += \ - $(ecore_con_eolian_c) \ - $(ecore_con_eolian_h) - ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ ecoreconeolianfiles_DATA = \ $(ecore_con_eolian_files) diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index 57f73b0750..2bcf7d2e24 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -17,10 +17,6 @@ BUILT_SOURCES += \ $(edje_eolian_c) \ $(edje_eolian_h) -CLEANFILES += \ - $(edje_eolian_c) \ - $(edje_eolian_h) - edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@ edjeeolianfiles_DATA = \ $(edje_eolian_files) \ diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am index ae1ee1a5cf..d8683e1362 100644 --- a/src/Makefile_Efl.am +++ b/src/Makefile_Efl.am @@ -41,11 +41,6 @@ BUILT_SOURCES += \ $(efl_eolian_files_h) \ $(efl_eolian_legacy_files_h) -CLEANFILES += \ - $(efl_eolian_files_c) \ - $(efl_eolian_files_h) \ - $(efl_eolian_legacy_files_h) - EXTRA_DIST += \ lib/efl/Efl_Config.h \ lib/efl/Efl.h \ diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index a2a406e5bb..dae18d6318 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -131,10 +131,6 @@ BUILT_SOURCES += \ $(elm_eolian_c) \ $(elm_eolian_h) -CLEANFILES += \ - $(elm_eolian_c) \ - $(elm_eolian_h) - elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@ elementaryeolianfiles_DATA = $(elm_eolian_files) $(elm_eolian_type_files) diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am index 10b15541fc..a204e259fa 100644 --- a/src/Makefile_Elua_Helper.am +++ b/src/Makefile_Elua_Helper.am @@ -21,5 +21,3 @@ SUFFIXES += .lua %.eo.lua: %.eo ${_ELUA_GEN_DEP} $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $< - -CLEANFILES += $(BUILT_SOURCES) diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am index 4da5224060..87285a8e0d 100644 --- a/src/Makefile_Emotion.am +++ b/src/Makefile_Emotion.am @@ -11,10 +11,6 @@ BUILT_SOURCES += \ $(emotion_eolian_c) \ $(emotion_eolian_h) -CLEANFILES += \ - $(emotion_eolian_c) \ - $(emotion_eolian_h) - emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@ emotioneolianfiles_DATA = \ $(emotion_eolian_files) diff --git a/src/Makefile_Eolian_Cxx_Helper.am b/src/Makefile_Eolian_Cxx_Helper.am index 1b06afdc8a..1b5ea61c47 100644 --- a/src/Makefile_Eolian_Cxx_Helper.am +++ b/src/Makefile_Eolian_Cxx_Helper.am @@ -16,5 +16,3 @@ SUFFIXES += .eo.hh $(AM_V_EOLCXX) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $< - -CLEANFILES += $(BUILT_SOURCES) diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am index 5cd5e380c9..87a4f3917b 100644 --- a/src/Makefile_Eolian_Helper.am +++ b/src/Makefile_Eolian_Helper.am @@ -31,5 +31,3 @@ SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h $(AM_V_EOL) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< - -CLEANFILES += $(BUILT_SOURCES) diff --git a/src/Makefile_Eolian_Js_Helper.am b/src/Makefile_Eolian_Js_Helper.am index fcc523153f..fc60a8db0d 100644 --- a/src/Makefile_Eolian_Js_Helper.am +++ b/src/Makefile_Eolian_Js_Helper.am @@ -14,5 +14,3 @@ SUFFIXES += .eo.js.cc %.eo.js.cc: %.eo $(_EOLIAN_JS_DEP) $(AM_V_EOLJS)$(EOLIAN_JS) $(EOLIAN_FLAGS) -o $@ $< - -CLEANFILES += $(BUILT_SOURCES) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 4a47e351fb..0769220be7 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -82,10 +82,6 @@ BUILT_SOURCES += \ $(evas_eolian_c) \ $(evas_eolian_h) -CLEANFILES += \ - $(evas_eolian_c) \ - $(evas_eolian_h) - evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@ evaseolianfiles_DATA = $(evas_eolian_files)