cedric pushed a commit to branch master.

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

commit f4441e5a21601dbde946bfe9a61772befe206882
Author: Cedric BAIL <ced...@osg.samsung.com>
Date:   Wed Apr 13 16:23:45 2016 -0700

    eo: make it possible to build the library alone.
---
 configure.ac                           |  1 +
 src/Makefile_Eolian_Helper.am          |  2 +-
 src/Makefile_Eolian_Subbuild_Helper.am |  6 +++++
 src/lib/eo/Makefile.am                 | 44 ++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f9049d2..c65d1ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5487,6 +5487,7 @@ src/lib/evil/Makefile
 src/lib/eina/Makefile
 src/lib/emile/Makefile
 src/lib/eet/Makefile
+src/lib/eo/Makefile
 src/benchmarks/eina/Makefile
 src/benchmarks/eo/Makefile
 src/benchmarks/evas/Makefile
diff --git a/src/Makefile_Eolian_Helper.am b/src/Makefile_Eolian_Helper.am
index ddf09e5..6fb7db5 100644
--- a/src/Makefile_Eolian_Helper.am
+++ b/src/Makefile_Eolian_Helper.am
@@ -3,7 +3,7 @@ EOLIAN_GEN = @eolian_gen@
 _EOLIAN_GEN_DEP = @eolian_gen@
 else
 EOLIAN_GEN = EFL_RUN_IN_TREE=1 
$(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
-_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
+_EOLIAN_GEN_DEP = $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
 endif
 
 include $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
diff --git a/src/Makefile_Eolian_Subbuild_Helper.am 
b/src/Makefile_Eolian_Subbuild_Helper.am
new file mode 100644
index 0000000..58686ed
--- /dev/null
+++ b/src/Makefile_Eolian_Subbuild_Helper.am
@@ -0,0 +1,6 @@
+EOLIAN_GEN = EFL_RUN_IN_TREE=1 
$(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
+_EOLIAN_GEN_DEP =
+
+EOLIAN_FLAGS += -I$(top_srcdir)/src/
+
+include        $(top_srcdir)/src/Makefile_Eolian_Files_Helper.am
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
new file mode 100644
index 0000000..c86764b
--- /dev/null
+++ b/src/lib/eo/Makefile.am
@@ -0,0 +1,44 @@
+EOLIAN_FLAGS = -I$(srcdir)
+
+include ../../Makefile_Eolian_Subbuild_Helper.am
+
+### Library
+eo_eolian_files = \
+       eo_base.eo \
+       eo_abstract_class.eo \
+       eo_interface.eo
+
+eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c)
+eo_eolian_h = $(eo_eolian_files:%.eo=%.eo.h)
+
+BUILT_SOURCES = $(eo_eolian_c) \
+                $(eo_eolian_h)
+
+CLEANFILES = $(eo_eolian_c) \
+             $(eo_eolian_h)
+
+lib_LTLIBRARIES = libeo.la
+
+installed_eomainheadersdir = $(includedir)/eo-@VMAJ@
+dist_installed_eomainheaders_DATA = Eo.h
+
+nodist_installed_eomainheaders_DATA = $(eo_eolian_h)
+
+libeo_la_SOURCES = \
+eo.c \
+eo_ptr_indirection.c \
+eo_ptr_indirection.h \
+eo_base_class.c \
+eo_class_class.c \
+eo_add_fallback.c \
+eo_add_fallback.h \
+eo_private.h
+
+libeo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EO_CFLAGS@
+libeo_la_LIBADD = @EO_SUBBUILD_LIBS@
+libeo_la_DEPENDENCIES = @EO_SUBBUILD_INTERNAL_LIBS@
+libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+eoeolianfilesdir = $(datadir)/eolian/include/eo-@VMAJ@
+eoeolianfiles_DATA = $(eo_eolian_files) \
+                    eina_types.eot # We don't generate .c/.h on purpose

-- 


Reply via email to