From 86ec4e28bcab9d562c6624e1a51a8be960110061 Mon Sep 17 00:00:00 2001 From: Yossi Kantor Date: Mon, 24 Mar 2014 13:56:18 +0200 Subject: [PATCH] Eolian: Integration of Ecore Parent --- src/Makefile_Ecore.am | 10 +++++++--- src/lib/ecore/ecore.c | 14 +------------- src/lib/ecore/ecore_parent.eo | 4 ++++ 3 files changed, 12 insertions(+), 16 deletions(-) create mode 100644 src/lib/ecore/ecore_parent.eo diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 857e8d1..d6c7731 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -15,7 +15,9 @@ BUILT_SOURCES += \ 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.h \ + lib/ecore/ecore_parent.eo.c \ + lib/ecore/ecore_parent.eo.h ecoreeolianfilesdir = $(datadir)/eolian/include/ecore-@VMAJ@ ecoreeolianfiles_DATA = \ @@ -25,7 +27,8 @@ ecoreeolianfiles_DATA = \ 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_animator.eo \ + lib/ecore/ecore_parent.eo EXTRA_DIST += \ ${ecoreeolianfiles_DATA} @@ -47,7 +50,8 @@ nodist_installed_ecoremainheaders_DATA = \ 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_animator.eo.h \ + lib/ecore/ecore_parent.eo.h lib_ecore_libecore_la_SOURCES = \ lib/ecore/ecore.c \ diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index 0468c92..10a18cd 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c @@ -1070,16 +1070,4 @@ ecore_memory_state_set(Ecore_Memory_State state) ecore_event_add(ECORE_EVENT_MEMORY_STATE, NULL, NULL, NULL); } - -static const Eo_Class_Description parent_class_desc = { - EO_VERSION, - "Ecore_Parent", - EO_CLASS_TYPE_REGULAR, - EO_CLASS_DESCRIPTION_OPS(NULL, NULL, 0), - NULL, - 0, - NULL, - NULL -}; - -EO_DEFINE_CLASS(ecore_parent_class_get, &parent_class_desc, EO_BASE_CLASS, NULL); +#include "ecore_parent.eo.c" \ No newline at end of file diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo new file mode 100644 index 0000000..0809b51 --- /dev/null +++ b/src/lib/ecore/ecore_parent.eo @@ -0,0 +1,4 @@ +class Ecore_Parent (Eo_Base) +{ + data: null; +} \ No newline at end of file -- 2.7.4