summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2016-03-31 16:22:04 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2016-03-31 16:29:32 +0200
commit0a03e633500466b86cca3b7a5f088735afd7cb56 (patch)
treee1738c8816d58859713b8af174a7464c53a665a4
parent08761352602f81962a09f7175dc50b1c3111c2dd (diff)
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
-rw-r--r--src/Makefile.am3
-rw-r--r--src/Makefile_Ecore.am4
-rw-r--r--src/Makefile_Ecore_Audio.am4
-rw-r--r--src/Makefile_Ecore_Con.am4
-rw-r--r--src/Makefile_Edje.am4
-rw-r--r--src/Makefile_Efl.am5
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/Makefile_Elua_Helper.am2
-rw-r--r--src/Makefile_Emotion.am4
-rw-r--r--src/Makefile_Eolian_Cxx_Helper.am2
-rw-r--r--src/Makefile_Eolian_Helper.am2
-rw-r--r--src/Makefile_Eolian_Js_Helper.am2
-rw-r--r--src/Makefile_Evas.am4
13 files changed, 3 insertions, 41 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index c256c4f..da975e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,6 +100,9 @@ endif
100include Makefile_Eolian_Js.am 100include Makefile_Eolian_Js.am
101include Makefile_Efl_Js.am 101include Makefile_Efl_Js.am
102 102
103# Make sure all generated files getting cleaned up
104CLEANFILES += $(BUILT_SOURCES)
105
103.PHONY: benchmark examples 106.PHONY: benchmark examples
104 107
105BENCHMARK_SUBDIRS = \ 108BENCHMARK_SUBDIRS = \
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 49936af..e5d5efc 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -28,10 +28,6 @@ BUILT_SOURCES += \
28 $(ecore_eolian_c) \ 28 $(ecore_eolian_c) \
29 $(ecore_eolian_h) 29 $(ecore_eolian_h)
30 30
31CLEANFILES += \
32 $(ecore_eolian_c) \
33 $(ecore_eolian_h)
34
35ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 31ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
36ecoreeolianfiles_DATA = $(ecore_eolian_files) \ 32ecoreeolianfiles_DATA = $(ecore_eolian_files) \
37 $(ecore_eolian_type_files) 33 $(ecore_eolian_type_files)
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index b500118..245ef9c 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -26,10 +26,6 @@ BUILT_SOURCES += \
26 $(ecore_audio_eolian_c) \ 26 $(ecore_audio_eolian_c) \
27 $(ecore_audio_eolian_h) 27 $(ecore_audio_eolian_h)
28 28
29CLEANFILES += \
30 $(ecore_audio_eolian_c) \
31 $(ecore_audio_eolian_h)
32
33ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 29ecore_audioeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
34ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files) 30ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files)
35 31
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 0199975..154d25b 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -19,10 +19,6 @@ BUILT_SOURCES += \
19 $(ecore_con_eolian_c) \ 19 $(ecore_con_eolian_c) \
20 $(ecore_con_eolian_h) 20 $(ecore_con_eolian_h)
21 21
22CLEANFILES += \
23 $(ecore_con_eolian_c) \
24 $(ecore_con_eolian_h)
25
26ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ 22ecoreconeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
27ecoreconeolianfiles_DATA = \ 23ecoreconeolianfiles_DATA = \
28 $(ecore_con_eolian_files) 24 $(ecore_con_eolian_files)
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 57f73b0..2bcf7d2 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -17,10 +17,6 @@ BUILT_SOURCES += \
17 $(edje_eolian_c) \ 17 $(edje_eolian_c) \
18 $(edje_eolian_h) 18 $(edje_eolian_h)
19 19
20CLEANFILES += \
21 $(edje_eolian_c) \
22 $(edje_eolian_h)
23
24edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@ 20edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
25edjeeolianfiles_DATA = \ 21edjeeolianfiles_DATA = \
26 $(edje_eolian_files) \ 22 $(edje_eolian_files) \
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index ae1ee1a..d8683e1 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -41,11 +41,6 @@ BUILT_SOURCES += \
41 $(efl_eolian_files_h) \ 41 $(efl_eolian_files_h) \
42 $(efl_eolian_legacy_files_h) 42 $(efl_eolian_legacy_files_h)
43 43
44CLEANFILES += \
45 $(efl_eolian_files_c) \
46 $(efl_eolian_files_h) \
47 $(efl_eolian_legacy_files_h)
48
49EXTRA_DIST += \ 44EXTRA_DIST += \
50 lib/efl/Efl_Config.h \ 45 lib/efl/Efl_Config.h \
51 lib/efl/Efl.h \ 46 lib/efl/Efl.h \
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index a2a406e..dae18d6 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -131,10 +131,6 @@ BUILT_SOURCES += \
131 $(elm_eolian_c) \ 131 $(elm_eolian_c) \
132 $(elm_eolian_h) 132 $(elm_eolian_h)
133 133
134CLEANFILES += \
135 $(elm_eolian_c) \
136 $(elm_eolian_h)
137
138elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@ 134elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
139elementaryeolianfiles_DATA = $(elm_eolian_files) $(elm_eolian_type_files) 135elementaryeolianfiles_DATA = $(elm_eolian_files) $(elm_eolian_type_files)
140 136
diff --git a/src/Makefile_Elua_Helper.am b/src/Makefile_Elua_Helper.am
index 10b1554..a204e25 100644
--- a/src/Makefile_Elua_Helper.am
+++ b/src/Makefile_Elua_Helper.am
@@ -21,5 +21,3 @@ SUFFIXES += .lua
21 21
22%.eo.lua: %.eo ${_ELUA_GEN_DEP} 22%.eo.lua: %.eo ${_ELUA_GEN_DEP}
23 $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $< 23 $(AM_V_ELUA)$(ELUA_GEN) $(EOLIAN_FLAGS) -o $@ $<
24
25CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 4da5224..87285a8 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -11,10 +11,6 @@ BUILT_SOURCES += \
11 $(emotion_eolian_c) \ 11 $(emotion_eolian_c) \
12 $(emotion_eolian_h) 12 $(emotion_eolian_h)
13 13
14CLEANFILES += \
15 $(emotion_eolian_c) \
16 $(emotion_eolian_h)
17
18emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@ 14emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@
19emotioneolianfiles_DATA = \ 15emotioneolianfiles_DATA = \
20 $(emotion_eolian_files) 16 $(emotion_eolian_files)
diff --git a/src/Makefile_Eolian_Cxx_Helper.am b/src/Makefile_Eolian_Cxx_Helper.am
index 1b06afd..1b5ea61 100644
--- a/src/Makefile_Eolian_Cxx_Helper.am
+++ b/src/Makefile_Eolian_Cxx_Helper.am
@@ -16,5 +16,3 @@ SUFFIXES += .eo.hh
16 $(AM_V_EOLCXX) \ 16 $(AM_V_EOLCXX) \
17 $(MKDIR_P) $(dir $@); \ 17 $(MKDIR_P) $(dir $@); \
18 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $< 18 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $<
19
20CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index 5cd5e38..87a4f39 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
31 $(AM_V_EOL) \ 31 $(AM_V_EOL) \
32 $(MKDIR_P) $(dir $@); \ 32 $(MKDIR_P) $(dir $@); \
33 $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $< 33 $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
34
35CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Eolian_Js_Helper.am b/src/Makefile_Eolian_Js_Helper.am
index fcc5231..fc60a8d 100644
--- a/src/Makefile_Eolian_Js_Helper.am
+++ b/src/Makefile_Eolian_Js_Helper.am
@@ -14,5 +14,3 @@ SUFFIXES += .eo.js.cc
14 14
15%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP) 15%.eo.js.cc: %.eo $(_EOLIAN_JS_DEP)
16 $(AM_V_EOLJS)$(EOLIAN_JS) $(EOLIAN_FLAGS) -o $@ $< 16 $(AM_V_EOLJS)$(EOLIAN_JS) $(EOLIAN_FLAGS) -o $@ $<
17
18CLEANFILES += $(BUILT_SOURCES)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 4a47e35..0769220 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -82,10 +82,6 @@ BUILT_SOURCES += \
82 $(evas_eolian_c) \ 82 $(evas_eolian_c) \
83 $(evas_eolian_h) 83 $(evas_eolian_h)
84 84
85CLEANFILES += \
86 $(evas_eolian_c) \
87 $(evas_eolian_h)
88
89evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@ 85evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
90evaseolianfiles_DATA = $(evas_eolian_files) 86evaseolianfiles_DATA = $(evas_eolian_files)
91 87