Efl: Create libefl.

Create libefl.so and the interal package for dependencies.

7 files changed, 64 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index 3b5ea42697..7174c548f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,6 +128,7 @@ pkgconfig_DATA += \
 pc/eina.pc \
 pc/eo.pc \
 pc/eolian.pc \
+pc/efl.pc \
 pc/eet.pc \
 pc/evas.pc \
 pc/ecore.pc \
diff --git a/configure.ac b/configure.ac
index c39c5505dd..48ddeb4ed9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1142,6 +1142,16 @@ EFL_INTERNAL_DEPEND_PKG([EOLIAN_CXX], [eo])
 ### Check availability
 EFL_LIB_END([Eolian_Cxx])
 
+#### Efl
+
+EFL_LIB_START([Efl])
+
+EFL_INTERNAL_DEPEND_PKG([EFL], [eina])
+EFL_INTERNAL_DEPEND_PKG([EFL], [eo])
+
+EFL_LIB_END([Efl])
+#### End of Efl
+
 #### Evas
 EFL_LIB_START_OPTIONAL([Evas], [test "x${build_gui}" = "xyes"])
 
@@ -2600,6 +2610,7 @@ EFL_PLATFORM_DEPEND([ECORE_INPUT_EVAS], [evil])
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas])
+EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [efl])
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eo])
 EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
 
@@ -3463,6 +3474,7 @@ EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas])
+EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [efl])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eo])
 EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
 
@@ -3630,6 +3642,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input])
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eet])
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas])
+EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [efl])
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo])
 EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina])
 
@@ -3934,6 +3947,7 @@ EFL_PLATFORM_DEPEND([EPHYSICS], [evil])
 
 EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina])
 EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas])
+EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [efl])
 EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore])
 EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eo])
 
@@ -3992,6 +4006,7 @@ EFL_PLATFORM_DEPEND([EDJE], [evil])
 
 EFL_INTERNAL_DEPEND_PKG([EDJE], [eina])
 EFL_INTERNAL_DEPEND_PKG([EDJE], [eo])
+EFL_INTERNAL_DEPEND_PKG([EDJE], [efl])
 EFL_INTERNAL_DEPEND_PKG([EDJE], [eet])
 EFL_INTERNAL_DEPEND_PKG([EDJE], [evas])
 EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore])
@@ -4114,6 +4129,7 @@ EFL_INTERNAL_DEPEND_PKG([EMOTION], [eo])
 EFL_INTERNAL_DEPEND_PKG([EMOTION], [ecore])
 EFL_INTERNAL_DEPEND_PKG([EMOTION], [eet])
 EFL_INTERNAL_DEPEND_PKG([EMOTION], [evas])
+EFL_INTERNAL_DEPEND_PKG([EMOTION], [efl])
 EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio])
 
 EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${efl_lib_optional_eeze}], [eeze])
@@ -4189,6 +4205,7 @@ EFL_PLATFORM_DEPEND([EINA], [evil])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eet])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB], [efl])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eo])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas])
@@ -4231,6 +4248,7 @@ EFL_PLATFORM_DEPEND([ETHUMB_CLIENT], [evil])
 ### Checks for libraries
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo])
+EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [efl])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eet])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore])
 EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edje])
@@ -4368,6 +4386,7 @@ pc/eo.pc
 pc/eo-cxx.pc
 pc/eolian.pc
 pc/eolian-cxx.pc
+pc/efl.pc
 pc/evas-fb.pc
 pc/evas-opengl-x11.pc
 pc/evas-opengl-sdl.pc
diff --git a/pc/efl.pc.in b/pc/efl.pc.in
new file mode 100644
index 0000000000..c422a518b5
--- /dev/null
+++ b/pc/efl.pc.in
@@ -0,0 +1,16 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+eoincludedir=@datadir@/eolian/include
+eolian_flags=-I${eoincludedir}/efl-@VMAJ@
+
+Name: Efl
+Description: EFL's general purpose library
+Version: @PACKAGE_VERSION@
+Requires.private: @requirements_pc_efl@
+Libs: -L${libdir} -lefl
+Libs.private:
+Cflags: -I${includedir}/efl-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index 58b009e8d4..ff0faaa58a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,13 +24,12 @@ EXTRA_DIST =
 
 EFL_INSTALL_EXEC_HOOK=
 
-include Makefile_Efl.am
-
 include Makefile_Evil.am
 include Makefile_Escape.am
 
 include Makefile_Eina.am
 include Makefile_Eo.am
+include Makefile_Efl.am
 include Makefile_Eet.am
 include Makefile_Eolian.am
 include Makefile_Ecore.am
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index aea1c48877..c6d9ce3bf6 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -24,6 +24,16 @@ efleolianfiles_DATA = \
 EXTRA_DIST += \
               ${efleolianfiles_DATA}
 
+lib_LTLIBRARIES += lib/efl/libefl.la
+
+lib_efl_libefl_la_SOURCES = \
+              lib/efl/interfaces/efl_interfaces_main.c
+
+lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EFL_CFLAGS@
+lib_efl_libefl_la_LIBADD = @EFL_LIBS@
+lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@
+lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
 installed_eflheadersdir = $(includedir)/efl-@VMAJ@
 dist_installed_eflheaders_DATA = \
-lib/efl/Efl_Config.h
+              lib/efl/Efl_Config.h
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
new file mode 100644
index 0000000000..dbc8ddb5f7
--- /dev/null
+++ b/src/lib/efl/Efl.h
@@ -0,0 +1,9 @@
+#ifndef _EFL_H
+#define _EFL_H
+
+#include <Eo.h>
+
+/* Interfaces */
+#include "interfaces/efl_interface_file.eo.h"
+
+#endif
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
new file mode 100644
index 0000000000..62fbce712b
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -0,0 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <Efl.h>
+
+#include "interfaces/efl_interface_file.eo.c"