tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=23143148f1a02b605bbdbc839e6d0c60dd6df300

commit 23143148f1a02b605bbdbc839e6d0c60dd6df300
Author: Tom Hacohen <t...@stosb.com>
Date:   Thu Oct 2 16:52:45 2014 +0100

    Build system: Clean up the generation of sources from eolian.
    
    This cleans up a lot of the build system. This makes everything
    consistent, clean, less redundant and also fixes the issue of make clean
    not cleaning up generated files.
---
 src/Makefile_Ecore.am       |  80 ++++++------------
 src/Makefile_Ecore_Audio.am |  50 +++++------
 src/Makefile_Ecore_Con.am   |  41 ++++-----
 src/Makefile_Edje.am        |  27 +++---
 src/Makefile_Efl.am         |  21 +++--
 src/Makefile_Emotion.am     |  21 +++--
 src/Makefile_Eo.am          |  25 ++++--
 src/Makefile_Evas.am        | 196 ++++++++++----------------------------------
 8 files changed, 170 insertions(+), 291 deletions(-)

diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index fe62dfd..7929314 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -1,46 +1,35 @@
 
 ### Library
 
+ecore_eolian_files_legacy = \
+       lib/ecore/ecore_timer.eo \
+       lib/ecore/ecore_poller.eo \
+       lib/ecore/ecore_job.eo \
+       lib/ecore/ecore_exe.eo \
+       lib/ecore/ecore_idler.eo \
+       lib/ecore/ecore_idle_enterer.eo \
+       lib/ecore/ecore_idle_exiter.eo \
+       lib/ecore/ecore_animator.eo
+
+ecore_eolian_files = \
+       $(ecore_eolian_files_legacy) \
+       lib/ecore/ecore_mainloop.eo \
+       lib/ecore/ecore_parent.eo
+
+ecore_eolian_c = $(ecore_eolian_files:%.eo=%.eo.c)
+ecore_eolian_h = $(ecore_eolian_files:%.eo=%.eo.h) \
+                 $(ecore_eolian_files_legacy:%.eo=%.eo.legacy.h)
+
 BUILT_SOURCES += \
-                 lib/ecore/ecore_timer.eo.c \
-                 lib/ecore/ecore_timer.eo.h \
-                 lib/ecore/ecore_timer.eo.legacy.h \
-                 lib/ecore/ecore_poller.eo.c \
-                 lib/ecore/ecore_poller.eo.h \
-                 lib/ecore/ecore_poller.eo.legacy.h \
-                 lib/ecore/ecore_exe.eo.c \
-                 lib/ecore/ecore_exe.eo.h \
-                 lib/ecore/ecore_exe.eo.legacy.h \
-                 lib/ecore/ecore_job.eo.c \
-                 lib/ecore/ecore_job.eo.h \
-                 lib/ecore/ecore_job.eo.legacy.h \
-                 lib/ecore/ecore_idler.eo.c \
-                 lib/ecore/ecore_idler.eo.h \
-                 lib/ecore/ecore_idler.eo.legacy.h \
-                 lib/ecore/ecore_idle_enterer.eo.c \
-                 lib/ecore/ecore_idle_enterer.eo.h \
-                 lib/ecore/ecore_idle_exiter.eo.c \
-                 lib/ecore/ecore_idle_exiter.eo.h \
-                 lib/ecore/ecore_animator.eo.c \
-                 lib/ecore/ecore_animator.eo.h \
-                 lib/ecore/ecore_animator.eo.legacy.h \
-                 lib/ecore/ecore_mainloop.eo.c \
-                 lib/ecore/ecore_mainloop.eo.h \
-                 lib/ecore/ecore_parent.eo.c \
-                 lib/ecore/ecore_parent.eo.h
+                 $(ecore_eolian_c) \
+                 $(ecore_eolian_h)
+
+CLEANFILES += \
+              $(ecore_eolian_c) \
+              $(ecore_eolian_h)
 
 ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@
-ecoreeolianfiles_DATA = \
-              lib/ecore/ecore_timer.eo \
-              lib/ecore/ecore_poller.eo \
-              lib/ecore/ecore_job.eo \
-              lib/ecore/ecore_exe.eo \
-              lib/ecore/ecore_idler.eo \
-              lib/ecore/ecore_idle_enterer.eo \
-              lib/ecore/ecore_idle_exiter.eo \
-              lib/ecore/ecore_animator.eo \
-              lib/ecore/ecore_mainloop.eo \
-              lib/ecore/ecore_parent.eo
+ecoreeolianfiles_DATA = $(ecore_eolian_files)
 
 EXTRA_DIST += \
               ${ecoreeolianfiles_DATA}
@@ -56,22 +45,7 @@ lib/ecore/Ecore_Eo.h \
 lib/ecore/Ecore_Getopt.h
 
 nodist_installed_ecoremainheaders_DATA = \
-                                        lib/ecore/ecore_timer.eo.h \
-                                        lib/ecore/ecore_poller.eo.h \
-                                        lib/ecore/ecore_exe.eo.h \
-                                        lib/ecore/ecore_exe.eo.legacy.h \
-                                        lib/ecore/ecore_job.eo.h \
-                                        lib/ecore/ecore_idler.eo.h \
-                                        lib/ecore/ecore_idle_enterer.eo.h \
-                                        lib/ecore/ecore_idle_exiter.eo.h \
-                                        lib/ecore/ecore_animator.eo.h \
-                                        lib/ecore/ecore_mainloop.eo.h \
-                                        lib/ecore/ecore_parent.eo.h \
-                                        lib/ecore/ecore_timer.eo.legacy.h \
-                                        lib/ecore/ecore_poller.eo.legacy.h \
-                                        lib/ecore/ecore_job.eo.legacy.h \
-                                        lib/ecore/ecore_idler.eo.legacy.h \
-                                        lib/ecore/ecore_animator.eo.legacy.h
+                                         $(ecore_eolian_h)
 
 lib_ecore_libecore_la_SOURCES = \
 lib/ecore/ecore.c \
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 1f2d3f2..4aee102 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -2,31 +2,28 @@ if HAVE_ECORE_AUDIO
 
 ### Library
 
+ecore_audio_eolian_files = \
+       lib/ecore_audio/ecore_audio.eo \
+       lib/ecore_audio/ecore_audio_in.eo \
+       lib/ecore_audio/ecore_audio_out.eo \
+       lib/ecore_audio/ecore_audio_in_sndfile.eo \
+       lib/ecore_audio/ecore_audio_out_sndfile.eo \
+       lib/ecore_audio/ecore_audio_out_pulse.eo \
+       lib/ecore_audio/ecore_audio_in_tone.eo
+
+ecore_audio_eolian_c = $(ecore_audio_eolian_files:%.eo=%.eo.c)
+ecore_audio_eolian_h = $(ecore_audio_eolian_files:%.eo=%.eo.h)
+
 BUILT_SOURCES += \
-                 lib/ecore_audio/ecore_audio.eo.c \
-                 lib/ecore_audio/ecore_audio.eo.h \
-                 lib/ecore_audio/ecore_audio_in.eo.c \
-                 lib/ecore_audio/ecore_audio_in.eo.h \
-                 lib/ecore_audio/ecore_audio_out.eo.c \
-                 lib/ecore_audio/ecore_audio_out.eo.h \
-                 lib/ecore_audio/ecore_audio_in_sndfile.eo.c \
-                 lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
-                 lib/ecore_audio/ecore_audio_out_sndfile.eo.c \
-                 lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
-                 lib/ecore_audio/ecore_audio_out_pulse.eo.c \
-                 lib/ecore_audio/ecore_audio_out_pulse.eo.h \
-                 lib/ecore_audio/ecore_audio_in_tone.eo.c \
-                 lib/ecore_audio/ecore_audio_in_tone.eo.h
+                 $(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 = \
-              lib/ecore_audio/ecore_audio.eo \
-              lib/ecore_audio/ecore_audio_in.eo \
-              lib/ecore_audio/ecore_audio_out.eo \
-              lib/ecore_audio/ecore_audio_in_sndfile.eo \
-              lib/ecore_audio/ecore_audio_out_sndfile.eo \
-              lib/ecore_audio/ecore_audio_out_pulse.eo \
-              lib/ecore_audio/ecore_audio_in_tone.eo
+ecore_audioeolianfiles_DATA = $(ecore_audio_eolian_files)
 
 EXTRA_DIST += \
               ${ecore_audioeolianfiles_DATA}
@@ -42,14 +39,7 @@ lib/ecore_audio/ecore_audio_obj_out.h \
 lib/ecore_audio/ecore_audio_obj_in_tone.h \
 lib/ecore_audio/ecore_audio_protected.h
 
-nodist_installed_ecoreaudiomainheaders_DATA = \
-                                        lib/ecore_audio/ecore_audio.eo.h \
-                                        lib/ecore_audio/ecore_audio_in.eo.h \
-                                        lib/ecore_audio/ecore_audio_out.eo.h \
-                                        
lib/ecore_audio/ecore_audio_in_sndfile.eo.h \
-                                        
lib/ecore_audio/ecore_audio_out_sndfile.eo.h \
-                                        
lib/ecore_audio/ecore_audio_out_pulse.eo.h \
-                                        
lib/ecore_audio/ecore_audio_in_tone.eo.h
+nodist_installed_ecoreaudiomainheaders_DATA = $(ecore_audio_eolian_h)
                                       
 lib_ecore_audio_libecore_audio_la_SOURCES = \
 lib/ecore_audio/ecore_audio.c \
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 3fecaa2..dbeb331 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -1,33 +1,28 @@
 
 ### Library
 
-ecorecon_eobuiltheaders = \
-                 lib/ecore_con/ecore_con_base.eo.h \
-                 lib/ecore_con/ecore_con_base.eo.legacy.h \
-                 lib/ecore_con/ecore_con_client.eo.h \
-                 lib/ecore_con/ecore_con_client.eo.legacy.h \
-                 lib/ecore_con/ecore_con_server.eo.h \
-                 lib/ecore_con/ecore_con_server.eo.legacy.h \
-                 lib/ecore_con/ecore_con_connector.eo.h \
-                 lib/ecore_con/ecore_con_connector.eo.legacy.h \
-                 lib/ecore_con/ecore_con_url.eo.h \
-                 lib/ecore_con/ecore_con_url.eo.legacy.h
+ecore_con_eolian_files = \
+       lib/ecore_con/ecore_con_base.eo \
+       lib/ecore_con/ecore_con_client.eo \
+       lib/ecore_con/ecore_con_server.eo \
+       lib/ecore_con/ecore_con_connector.eo \
+       lib/ecore_con/ecore_con_url.eo
+
+ecore_con_eolian_c = $(ecore_con_eolian_files:%.eo=%.eo.c)
+ecore_con_eolian_h = $(ecore_con_eolian_files:%.eo=%.eo.h) \
+                     $(ecore_con_eolian_files:%.eo=%.eo.legacy.h)
 
 BUILT_SOURCES += \
-                 ${ecorecon_eobuiltheaders} \
-                 lib/ecore_con/ecore_con_base.eo.c \
-                 lib/ecore_con/ecore_con_client.eo.c \
-                 lib/ecore_con/ecore_con_server.eo.c \
-                 lib/ecore_con/ecore_con_connector.eo.c \
-                 lib/ecore_con/ecore_con_url.eo.c
+                 $(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 = \
-              lib/ecore_con/ecore_con_base.eo \
-              lib/ecore_con/ecore_con_client.eo \
-              lib/ecore_con/ecore_con_server.eo \
-              lib/ecore_con/ecore_con_connector.eo \
-              lib/ecore_con/ecore_con_url.eo
+                           $(ecore_con_eolian_files)
 
 EXTRA_DIST += \
               ${ecoreconeolianfiles_DATA}
@@ -42,7 +37,7 @@ lib/ecore_con/Ecore_Con_Eo.h \
 lib/ecore_con/Ecore_Con_Eet.h
 
 nodist_installed_ecoreconmainheaders_DATA = \
-                                            ${ecorecon_eobuiltheaders}
+                                            $(ecore_con_eolian_h)
 
 lib_ecore_con_libecore_con_la_SOURCES = \
 lib/ecore_con/ecore_con_alloc.c \
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index b09f0a3..c92372f 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -1,19 +1,25 @@
 
 ### Library
 
+edje_eolian_files = \
+       lib/edje/edje_object.eo \
+       lib/edje/edje_edit.eo
+
+edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c)
+edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \
+                $(edje_eolian_files:%.eo=%.eo.legacy.h)
+
 BUILT_SOURCES += \
-                 lib/edje/edje_object.eo.c \
-                 lib/edje/edje_object.eo.h \
-                 lib/edje/edje_object.eo.legacy.h \
-                 lib/edje/edje_edit.eo.c \
-                 lib/edje/edje_edit.eo.h \
-                 lib/edje/edje_edit.eo.legacy.h
+                 $(edje_eolian_c) \
+                 $(edje_eolian_h)
 
+CLEANFILES += \
+              $(edje_eolian_c) \
+              $(edje_eolian_h)
 
 edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@
 edjeeolianfiles_DATA = \
-              lib/edje/edje_object.eo \
-              lib/edje/edje_edit.eo
+                       $(edje_eolian_files)
 
 EXTRA_DIST += \
               ${edjeeolianfiles_DATA}
@@ -40,10 +46,7 @@ lib/edje/Edje_Legacy.h \
 lib/edje/Edje_Edit.h
 
 nodist_installed_edjemainheaders_DATA = \
-                                        lib/edje/edje_object.eo.h \
-                                        lib/edje/edje_edit.eo.h \
-                                        lib/edje/edje_object.eo.legacy.h \
-                                        lib/edje/edje_edit.eo.legacy.h
+                                        $(edje_eolian_h)
 
 lib_edje_libedje_la_SOURCES = \
 lib/edje/edje_private.h \
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 9b8339f..3081514 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -1,4 +1,4 @@
-EFL_EOS = \
+efl_eolian_files = \
       lib/efl/interfaces/efl_control.eo \
       lib/efl/interfaces/efl_file.eo \
       lib/efl/interfaces/efl_image.eo \
@@ -6,17 +6,24 @@ EFL_EOS = \
       lib/efl/interfaces/efl_text.eo \
       lib/efl/interfaces/efl_text_properties.eo
 
-EFL_EOS_H = $(EFL_EOS:%.eo=%.eo.h)
-EFL_EOS_C = $(EFL_EOS:%.eo=%.eo.c)
+efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h)
+efl_eolian_files_c = $(efl_eolian_files:%.eo=%.eo.c)
+
+BUILT_SOURCES += \
+                 $(efl_eolian_files_c) \
+                 $(efl_eolian_files_h)
+
+CLEANFILES += \
+              $(efl_eolian_files_c) \
+              $(efl_eolian_files_h)
 
-BUILT_SOURCES += $(EFL_EOS_C) $(EFL_EOS_H)
 EXTRA_DIST += \
       lib/efl/Efl_Config.h \
       lib/efl/Efl.h \
-      $(EFL_EOS)
+      $(efl_eolian_files)
 
 efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
-efleolianfiles_DATA = $(EFL_EOS)
+efleolianfiles_DATA = $(efl_eolian_files)
 
 lib_LTLIBRARIES += lib/efl/libefl.la
 
@@ -32,4 +39,4 @@ dist_installed_eflheaders_DATA = \
               lib/efl/Efl.h
 
 installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
-nodist_installed_eflinterfaces_DATA = $(EFL_EOS_H)
+nodist_installed_eflinterfaces_DATA = $(efl_eolian_files_h)
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 5449f81..242a671 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -1,13 +1,23 @@
 ### Library
 
+emotion_eolian_files = \
+       lib/emotion/emotion_object.eo
+
+emotion_eolian_c = $(emotion_eolian_files:%.eo=%.eo.c)
+emotion_eolian_h = $(emotion_eolian_files:%.eo=%.eo.h) \
+                   $(emotion_eolian_files:%.eo=%.eo.legacy.h)
+
 BUILT_SOURCES += \
-                 lib/emotion/emotion_object.eo.c \
-                 lib/emotion/emotion_object.eo.h \
-                 lib/emotion/emotion_object.eo.legacy.h
+                 $(emotion_eolian_c) \
+                 $(emotion_eolian_h)
+
+CLEANFILES += \
+              $(emotion_eolian_c) \
+              $(emotion_eolian_h)
 
 emotioneolianfilesdir = $(datadir)/eolian/include/emotion-@VMAJ@
 emotioneolianfiles_DATA = \
-              lib/emotion/emotion_object.eo
+                          $(emotion_eolian_files)
 
 EXTRA_DIST += \
               ${emotioneolianfiles_DATA}
@@ -21,8 +31,7 @@ dist_installed_emotionmainheaders_DATA = 
lib/emotion/Emotion.h \
                                          lib/emotion/Emotion_Eo.h
 
 nodist_installed_emotionmainheaders_DATA = \
-                                        lib/emotion/emotion_object.eo.h \
-                                        lib/emotion/emotion_object.eo.legacy.h
+                                           $(emotion_eolian_h)
 
 # libemotion.la
 lib_emotion_libemotion_la_SOURCES = \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 28c7d5c..835c55c 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -1,11 +1,22 @@
 
 ### Library
 
+eo_eolian_files = \
+       lib/eo/eo_base.eo.c \
+       lib/eo/eo_base.eo.h \
+       lib/eo/eo_abstract_class.eo.c \
+       lib/eo/eo_abstract_class.eo.h
+
+eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c)
+eo_eolian_h = $(eo_eolian_files:%.eo=%.eo.h)
+
 BUILT_SOURCES += \
-                 lib/eo/eo_base.eo.c \
-                 lib/eo/eo_base.eo.h \
-                 lib/eo/eo_abstract_class.eo.c \
-                 lib/eo/eo_abstract_class.eo.h
+                 $(eo_eolian_c) \
+                 $(eo_eolian_h)
+
+CLEANFILES += \
+              $(eo_eolian_c) \
+              $(eo_eolian_h)
 
 lib_LTLIBRARIES += lib/eo/libeo.la
 
@@ -13,8 +24,7 @@ installed_eomainheadersdir = $(includedir)/eo-@VMAJ@
 dist_installed_eomainheaders_DATA = lib/eo/Eo.h
 
 nodist_installed_eomainheaders_DATA = \
-                                      lib/eo/eo_base.eo.h \
-                                      lib/eo/eo_abstract_class.eo.h
+                                                                         
$(eo_eolian_h)
 
 lib_eo_libeo_la_SOURCES = \
 lib/eo/eo.c \
@@ -31,8 +41,7 @@ lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
 eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@
 eoeolianfiles_DATA = \
-              lib/eo/eo_base.eo \
-              lib/eo/eo_abstract_class.eo
+                                        $(eo_eolian_files)
 
 EXTRA_DIST += \
               ${eoeolianfiles_DATA}
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 12919ae..44fa534 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1,116 +1,53 @@
 
 ### Library
 
+evas_eolian_files = \
+       lib/evas/canvas/evas_object.eo \
+       lib/evas/canvas/evas_line.eo \
+       lib/evas/canvas/evas_polygon.eo \
+       lib/evas/canvas/evas_rectangle.eo \
+       lib/evas/canvas/evas_text.eo \
+       lib/evas/canvas/evas_textblock.eo \
+       lib/evas/canvas/evas_textgrid.eo \
+       lib/evas/canvas/evas_signal_interface.eo \
+       lib/evas/canvas/evas_object_smart.eo \
+       lib/evas/canvas/evas_smart_clipped.eo \
+       lib/evas/canvas/evas_table.eo \
+       lib/evas/canvas/evas_common_interface.eo \
+       lib/evas/canvas/evas_canvas.eo \
+       lib/evas/canvas/evas_grid.eo \
+       lib/evas/canvas/evas_image.eo \
+       lib/evas/canvas/evas_out.eo \
+       lib/evas/canvas/evas_draggable_interface.eo \
+       lib/evas/canvas/evas_clickable_interface.eo \
+       lib/evas/canvas/evas_scrollable_interface.eo \
+       lib/evas/canvas/evas_selectable_interface.eo \
+       lib/evas/canvas/evas_zoomable_interface.eo \
+       lib/evas/canvas/evas_box.eo\
+       lib/evas/canvas/evas_3d_camera.eo\
+       lib/evas/canvas/evas_3d_texture.eo\
+       lib/evas/canvas/evas_3d_material.eo\
+       lib/evas/canvas/evas_3d_light.eo\
+       lib/evas/canvas/evas_3d_mesh.eo\
+       lib/evas/canvas/evas_3d_node.eo\
+       lib/evas/canvas/evas_3d_scene.eo\
+       lib/evas/canvas/evas_3d_object.eo
+
+evas_eolian_c = $(evas_eolian_files:%.eo=%.eo.c)
+evas_eolian_h = $(evas_eolian_files:%.eo=%.eo.h) \
+                $(evas_eolian_files:%.eo=%.eo.legacy.h)
+
 BUILT_SOURCES += \
-                 lib/evas/canvas/evas_line.eo.c \
-                 lib/evas/canvas/evas_line.eo.h \
-                 lib/evas/canvas/evas_line.eo.legacy.h \
-                 lib/evas/canvas/evas_polygon.eo.c \
-                 lib/evas/canvas/evas_polygon.eo.h \
-                 lib/evas/canvas/evas_polygon.eo.legacy.h \
-                 lib/evas/canvas/evas_rectangle.eo.c \
-                 lib/evas/canvas/evas_rectangle.eo.h \
-                 lib/evas/canvas/evas_rectangle.eo.legacy.h \
-                 lib/evas/canvas/evas_text.eo.c \
-                 lib/evas/canvas/evas_text.eo.h \
-                 lib/evas/canvas/evas_text.eo.legacy.h \
-                 lib/evas/canvas/evas_textblock.eo.c \
-                 lib/evas/canvas/evas_textblock.eo.h \
-                 lib/evas/canvas/evas_textblock.eo.legacy.h \
-                 lib/evas/canvas/evas_textgrid.eo.c \
-                 lib/evas/canvas/evas_textgrid.eo.h \
-                 lib/evas/canvas/evas_textgrid.eo.legacy.h \
-                 lib/evas/canvas/evas_signal_interface.eo.c \
-                 lib/evas/canvas/evas_signal_interface.eo.h \
-                 lib/evas/canvas/evas_object_smart.eo.c \
-                 lib/evas/canvas/evas_object_smart.eo.h \
-                 lib/evas/canvas/evas_object_smart.eo.legacy.h \
-                 lib/evas/canvas/evas_smart_clipped.eo.c \
-                 lib/evas/canvas/evas_smart_clipped.eo.h \
-                 lib/evas/canvas/evas_smart_clipped.eo.legacy.h \
-                 lib/evas/canvas/evas_table.eo.c \
-                 lib/evas/canvas/evas_table.eo.h \
-                 lib/evas/canvas/evas_table.eo.legacy.h \
-                 lib/evas/canvas/evas_common_interface.eo.c \
-                 lib/evas/canvas/evas_common_interface.eo.h \
-                 lib/evas/canvas/evas_common_interface.eo.legacy.h \
-                 lib/evas/canvas/evas_object.eo.c \
-                 lib/evas/canvas/evas_object.eo.h \
-                 lib/evas/canvas/evas_object.eo.legacy.h \
-                 lib/evas/canvas/evas_canvas.eo.c \
-                 lib/evas/canvas/evas_canvas.eo.h \
-                 lib/evas/canvas/evas_canvas.eo.legacy.h \
-                 lib/evas/canvas/evas_grid.eo.c \
-                 lib/evas/canvas/evas_grid.eo.h \
-                 lib/evas/canvas/evas_grid.eo.legacy.h \
-                 lib/evas/canvas/evas_image.eo.c \
-                 lib/evas/canvas/evas_image.eo.h \
-                 lib/evas/canvas/evas_image.eo.legacy.h \
-                 lib/evas/canvas/evas_out.eo.c \
-                 lib/evas/canvas/evas_out.eo.h \
-                 lib/evas/canvas/evas_out.eo.legacy.h \
-                 lib/evas/canvas/evas_draggable_interface.eo.c \
-                 lib/evas/canvas/evas_draggable_interface.eo.h \
-                 lib/evas/canvas/evas_clickable_interface.eo.c \
-                 lib/evas/canvas/evas_clickable_interface.eo.h \
-                 lib/evas/canvas/evas_scrollable_interface.eo.c \
-                 lib/evas/canvas/evas_scrollable_interface.eo.h \
-                 lib/evas/canvas/evas_selectable_interface.eo.c \
-                 lib/evas/canvas/evas_selectable_interface.eo.h \
-                 lib/evas/canvas/evas_zoomable_interface.eo.c \
-                 lib/evas/canvas/evas_zoomable_interface.eo.h \
-                 lib/evas/canvas/evas_box.eo.c \
-                 lib/evas/canvas/evas_box.eo.h \
-                 lib/evas/canvas/evas_box.eo.legacy.h \
-                 lib/evas/canvas/evas_3d_camera.eo.c\
-                 lib/evas/canvas/evas_3d_camera.eo.h\
-                 lib/evas/canvas/evas_3d_texture.eo.c\
-                 lib/evas/canvas/evas_3d_texture.eo.h\
-                 lib/evas/canvas/evas_3d_material.eo.c\
-                 lib/evas/canvas/evas_3d_material.eo.h\
-                 lib/evas/canvas/evas_3d_light.eo.c\
-                 lib/evas/canvas/evas_3d_light.eo.h\
-                 lib/evas/canvas/evas_3d_mesh.eo.c\
-                 lib/evas/canvas/evas_3d_mesh.eo.h\
-                 lib/evas/canvas/evas_3d_node.eo.c\
-                 lib/evas/canvas/evas_3d_node.eo.h\
-                 lib/evas/canvas/evas_3d_scene.eo.c\
-                 lib/evas/canvas/evas_3d_scene.eo.h\
-                 lib/evas/canvas/evas_3d_object.eo.c\
-                 lib/evas/canvas/evas_3d_object.eo.h
+                 $(evas_eolian_c) \
+                 $(evas_eolian_h)
+
+CLEANFILES += \
+              $(evas_eolian_c) \
+              $(evas_eolian_h)
 
 evaseolianfilesdir = $(datadir)/eolian/include/evas-@VMAJ@
 evaseolianfiles_DATA = \
-              lib/evas/canvas/evas_object.eo \
-              lib/evas/canvas/evas_line.eo \
-              lib/evas/canvas/evas_polygon.eo \
-              lib/evas/canvas/evas_rectangle.eo \
-              lib/evas/canvas/evas_text.eo \
-              lib/evas/canvas/evas_textblock.eo \
-              lib/evas/canvas/evas_textgrid.eo \
-              lib/evas/canvas/evas_signal_interface.eo \
-              lib/evas/canvas/evas_object_smart.eo \
-              lib/evas/canvas/evas_smart_clipped.eo \
-              lib/evas/canvas/evas_table.eo \
-              lib/evas/canvas/evas_common_interface.eo \
-              lib/evas/canvas/evas_canvas.eo \
-              lib/evas/canvas/evas_grid.eo \
-              lib/evas/canvas/evas_image.eo \
-              lib/evas/canvas/evas_out.eo \
-              lib/evas/canvas/evas_draggable_interface.eo \
-              lib/evas/canvas/evas_clickable_interface.eo \
-              lib/evas/canvas/evas_scrollable_interface.eo \
-              lib/evas/canvas/evas_selectable_interface.eo \
-              lib/evas/canvas/evas_zoomable_interface.eo \
-              lib/evas/canvas/evas_box.eo\
-              lib/evas/canvas/evas_3d_camera.eo\
-              lib/evas/canvas/evas_3d_texture.eo\
-              lib/evas/canvas/evas_3d_material.eo\
-              lib/evas/canvas/evas_3d_light.eo\
-              lib/evas/canvas/evas_3d_mesh.eo\
-              lib/evas/canvas/evas_3d_node.eo\
-              lib/evas/canvas/evas_3d_scene.eo\
-              lib/evas/canvas/evas_3d_object.eo
+              $(evas_eolian_files)
 
 EXTRA_DIST += \
               ${evaseolianfiles_DATA}
@@ -129,52 +66,7 @@ lib/evas/Evas_Loader.h
 
 installed_evascanvasheadersdir = $(includedir)/evas-@VMAJ@/canvas
 nodist_installed_evascanvasheaders_DATA = \
-                                        lib/evas/canvas/evas_line.eo.h \
-                                        lib/evas/canvas/evas_polygon.eo.h \
-                                        lib/evas/canvas/evas_rectangle.eo.h \
-                                        lib/evas/canvas/evas_text.eo.h \
-                                        lib/evas/canvas/evas_textblock.eo.h \
-                                        lib/evas/canvas/evas_textgrid.eo.h \
-                                        
lib/evas/canvas/evas_signal_interface.eo.h \
-                                        lib/evas/canvas/evas_object_smart.eo.h 
\
-                                        
lib/evas/canvas/evas_smart_clipped.eo.h \
-                                        lib/evas/canvas/evas_table.eo.h \
-                                        
lib/evas/canvas/evas_common_interface.eo.h \
-                                        lib/evas/canvas/evas_object.eo.h \
-                                        lib/evas/canvas/evas_canvas.eo.h \
-                                        lib/evas/canvas/evas_grid.eo.h \
-                                        lib/evas/canvas/evas_image.eo.h \
-                                        lib/evas/canvas/evas_out.eo.h \
-                                        
lib/evas/canvas/evas_draggable_interface.eo.h \
-                                        
lib/evas/canvas/evas_clickable_interface.eo.h \
-                                        
lib/evas/canvas/evas_scrollable_interface.eo.h \
-                                        
lib/evas/canvas/evas_selectable_interface.eo.h \
-                                        
lib/evas/canvas/evas_zoomable_interface.eo.h \
-                                        lib/evas/canvas/evas_box.eo.h \
-                                        lib/evas/canvas/evas_line.eo.legacy.h \
-                                        
lib/evas/canvas/evas_polygon.eo.legacy.h \
-                                        
lib/evas/canvas/evas_rectangle.eo.legacy.h \
-                                        lib/evas/canvas/evas_text.eo.legacy.h \
-                                        
lib/evas/canvas/evas_textblock.eo.legacy.h \
-                                        
lib/evas/canvas/evas_textgrid.eo.legacy.h \
-                                        lib/evas/canvas/evas_table.eo.legacy.h 
\
-                                        
lib/evas/canvas/evas_object_smart.eo.legacy.h \
-                                        
lib/evas/canvas/evas_smart_clipped.eo.legacy.h \
-                                        
lib/evas/canvas/evas_common_interface.eo.legacy.h \
-                                        
lib/evas/canvas/evas_object.eo.legacy.h \
-                                        lib/evas/canvas/evas_grid.eo.legacy.h \
-                                        lib/evas/canvas/evas_image.eo.legacy.h 
\
-                                        lib/evas/canvas/evas_out.eo.legacy.h \
-                                        lib/evas/canvas/evas_box.eo.legacy.h \
-                                        
lib/evas/canvas/evas_canvas.eo.legacy.h \
-                                        lib/evas/canvas/evas_3d_camera.eo.h \
-                                        lib/evas/canvas/evas_3d_light.eo.h \
-                                        lib/evas/canvas/evas_3d_material.eo.h \
-                                        lib/evas/canvas/evas_3d_mesh.eo.h \
-                                        lib/evas/canvas/evas_3d_node.eo.h \
-                                        lib/evas/canvas/evas_3d_object.eo.h \
-                                        lib/evas/canvas/evas_3d_scene.eo.h \
-                                        lib/evas/canvas/evas_3d_texture.eo.h
+                                          $(evas_eolian_h)
 
 noinst_HEADERS = \
 lib/evas/include/evas_inline.x \

-- 


Reply via email to