From 951fa3ac29276084769d6717e11ff1c0979a0fda Mon Sep 17 00:00:00 2001 From: Savio Sena Date: Tue, 1 Jul 2014 13:38:49 -0300 Subject: [PATCH] autotools: Fixed 'make clean' for Eolian-Cxx. Included all generated C++ headers in CLEANFILES (Automake). --- src/Makefile_Ecore_Audio_Cxx.am | 4 ++++ src/Makefile_Ecore_Cxx.am | 13 ++++++++----- src/Makefile_Edje_Cxx.am | 14 +++++++++----- src/Makefile_Evas_Cxx.am | 16 ++++++++++------ 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/Makefile_Ecore_Audio_Cxx.am b/src/Makefile_Ecore_Audio_Cxx.am index 27c60a5..4967da2 100644 --- a/src/Makefile_Ecore_Audio_Cxx.am +++ b/src/Makefile_Ecore_Audio_Cxx.am @@ -18,6 +18,10 @@ lib/ecore_audio/Ecore_Audio.hh: @for i in $(generated_ecore_audio_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh; done @echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh +CLEANFILES += \ + $(generated_ecore_audio_cxx_bindings) \ + lib/ecore_audio/Ecore_Audio.hh + installed_ecoreaudiocxxmainheadersdir = $(includedir)/ecore-audio-cxx-@VMAJ@ nodist_installed_ecoreaudiocxxmainheaders_DATA = \ lib/ecore_audio/Ecore_Audio.hh \ diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am index 4ce616e..97dae38 100644 --- a/src/Makefile_Ecore_Cxx.am +++ b/src/Makefile_Ecore_Cxx.am @@ -14,17 +14,20 @@ lib/ecore/ecore_idle_exiter.eo.hh \ lib/ecore/ecore_animator.eo.hh \ lib/ecore/ecore_parent.eo.hh -installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ -nodist_installed_ecorecxxheaders_DATA = \ -lib/ecore/Ecore.eo.hh \ -$(generated_ecore_cxx_bindings) - lib/ecore/Ecore.eo.hh: @echo -e "#ifndef EFL_CXX_ECORE_HH\n#define EFL_CXX_ECORE_HH\n" > $(top_builddir)/src/lib/ecore/Ecore.eo.hh @echo -e "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh @for i in $(generated_ecore_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done @echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh +CLEANFILES += \ +$(generated_ecore_cxx_bindings) \ +lib/ecore/Ecore.eo.hh + +installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ +nodist_installed_ecorecxxheaders_DATA = \ +lib/ecore/Ecore.eo.hh \ +$(generated_ecore_cxx_bindings) ### Unit tests diff --git a/src/Makefile_Edje_Cxx.am b/src/Makefile_Edje_Cxx.am index b41bb29..79bd3e1 100644 --- a/src/Makefile_Edje_Cxx.am +++ b/src/Makefile_Edje_Cxx.am @@ -7,17 +7,21 @@ generated_edje_cxx_bindings = \ lib/edje/edje_object.eo.hh \ lib/edje/edje_edit.eo.hh -installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ -nodist_installed_edjecxxmainheaders_DATA = \ -lib/edje/Edje.hh \ -$(generated_edje_cxx_bindings) - lib/edje/Edje.hh: $(generated_edje_cxx_bindings) @echo -e "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh @echo -e "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/edje/Edje.hh @for i in $(generated_edje_cxx_bindings); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done @echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh +CLEANFILES += \ +$(generated_edje_cxx_bindings) \ +lib/edje/Edje.hh + +installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ +nodist_installed_edjecxxmainheaders_DATA = \ +lib/edje/Edje.hh \ +$(generated_edje_cxx_bindings) + ### Unit tests if EFL_ENABLE_TESTS diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am index 405d89a..7b16b4d 100644 --- a/src/Makefile_Evas_Cxx.am +++ b/src/Makefile_Evas_Cxx.am @@ -27,18 +27,22 @@ lib/evas/canvas/evas_selectable_interface.eo.hh \ lib/evas/canvas/evas_zoomable_interface.eo.hh \ lib/evas/canvas/evas_box.eo.hh -installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ -nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh - -installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas -nodist_installed_evascxxcanvasheaders_DATA = $(generated_evas_canvas_cxx_bindings) - lib/evas/Evas.hh: @echo -e "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh @echo -e "#ifdef EFL_BETA_API_SUPPORT" >> $(top_builddir)/src/lib/evas/Evas.hh @for i in $(generated_evas_canvas_cxx_bindings); do echo "#include " >> $(top_builddir)/src/lib/evas/Evas.hh; done @echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh +CLEANFILES += \ +$(generated_evas_canvas_cxx_bindings) \ +lib/evas/Evas.hh + +installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ +nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh + +installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas +nodist_installed_evascxxcanvasheaders_DATA = $(generated_evas_canvas_cxx_bindings) + ### Unit tests if EFL_ENABLE_TESTS -- 2.7.4