summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-07-18 13:38:25 +0100
committerTom Hacohen <tom@stosb.com>2014-08-21 11:02:10 +0100
commitb0b533fcb1beff3c01501258bb4af4a6533e6884 (patch)
tree7beb007016fe2d1c1c12bec95c5d1b1b62785e9f
parent0658591a4d99d45f33c9fc5b8f6b60c28eb7069b (diff)
Efl: Create libefl.
Create libefl.so and the interal package for dependencies.
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac19
-rw-r--r--pc/efl.pc.in16
-rw-r--r--src/Makefile.am3
-rw-r--r--src/Makefile_Efl.am12
-rw-r--r--src/lib/efl/Efl.h9
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c7
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 += \
128pc/eina.pc \ 128pc/eina.pc \
129pc/eo.pc \ 129pc/eo.pc \
130pc/eolian.pc \ 130pc/eolian.pc \
131pc/efl.pc \
131pc/eet.pc \ 132pc/eet.pc \
132pc/evas.pc \ 133pc/evas.pc \
133pc/ecore.pc \ 134pc/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])
1142### Check availability 1142### Check availability
1143EFL_LIB_END([Eolian_Cxx]) 1143EFL_LIB_END([Eolian_Cxx])
1144 1144
1145#### Efl
1146
1147EFL_LIB_START([Efl])
1148
1149EFL_INTERNAL_DEPEND_PKG([EFL], [eina])
1150EFL_INTERNAL_DEPEND_PKG([EFL], [eo])
1151
1152EFL_LIB_END([Efl])
1153#### End of Efl
1154
1145#### Evas 1155#### Evas
1146EFL_LIB_START_OPTIONAL([Evas], [test "x${build_gui}" = "xyes"]) 1156EFL_LIB_START_OPTIONAL([Evas], [test "x${build_gui}" = "xyes"])
1147 1157
@@ -2600,6 +2610,7 @@ EFL_PLATFORM_DEPEND([ECORE_INPUT_EVAS], [evil])
2600EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input]) 2610EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore-input])
2601EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore]) 2611EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [ecore])
2602EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas]) 2612EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [evas])
2613EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [efl])
2603EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eo]) 2614EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eo])
2604EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina]) 2615EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT_EVAS], [eina])
2605 2616
@@ -3463,6 +3474,7 @@ EFL_PLATFORM_DEPEND([ECORE_IMF_EVAS], [escape])
3463EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf]) 3474EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore-imf])
3464EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore]) 3475EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [ecore])
3465EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas]) 3476EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [evas])
3477EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [efl])
3466EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eo]) 3478EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eo])
3467EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina]) 3479EFL_INTERNAL_DEPEND_PKG([ECORE_IMF_EVAS], [eina])
3468 3480
@@ -3630,6 +3642,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore-input])
3630EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore]) 3642EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [ecore])
3631EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eet]) 3643EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eet])
3632EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas]) 3644EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [evas])
3645EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [efl])
3633EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo]) 3646EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eo])
3634EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina]) 3647EFL_INTERNAL_DEPEND_PKG([ECORE_EVAS], [eina])
3635 3648
@@ -3934,6 +3947,7 @@ EFL_PLATFORM_DEPEND([EPHYSICS], [evil])
3934 3947
3935EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina]) 3948EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eina])
3936EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas]) 3949EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [evas])
3950EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [efl])
3937EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore]) 3951EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [ecore])
3938EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eo]) 3952EFL_INTERNAL_DEPEND_PKG([EPHYSICS], [eo])
3939 3953
@@ -3992,6 +4006,7 @@ EFL_PLATFORM_DEPEND([EDJE], [evil])
3992 4006
3993EFL_INTERNAL_DEPEND_PKG([EDJE], [eina]) 4007EFL_INTERNAL_DEPEND_PKG([EDJE], [eina])
3994EFL_INTERNAL_DEPEND_PKG([EDJE], [eo]) 4008EFL_INTERNAL_DEPEND_PKG([EDJE], [eo])
4009EFL_INTERNAL_DEPEND_PKG([EDJE], [efl])
3995EFL_INTERNAL_DEPEND_PKG([EDJE], [eet]) 4010EFL_INTERNAL_DEPEND_PKG([EDJE], [eet])
3996EFL_INTERNAL_DEPEND_PKG([EDJE], [evas]) 4011EFL_INTERNAL_DEPEND_PKG([EDJE], [evas])
3997EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore]) 4012EFL_INTERNAL_DEPEND_PKG([EDJE], [ecore])
@@ -4114,6 +4129,7 @@ EFL_INTERNAL_DEPEND_PKG([EMOTION], [eo])
4114EFL_INTERNAL_DEPEND_PKG([EMOTION], [ecore]) 4129EFL_INTERNAL_DEPEND_PKG([EMOTION], [ecore])
4115EFL_INTERNAL_DEPEND_PKG([EMOTION], [eet]) 4130EFL_INTERNAL_DEPEND_PKG([EMOTION], [eet])
4116EFL_INTERNAL_DEPEND_PKG([EMOTION], [evas]) 4131EFL_INTERNAL_DEPEND_PKG([EMOTION], [evas])
4132EFL_INTERNAL_DEPEND_PKG([EMOTION], [efl])
4117EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio]) 4133EFL_INTERNAL_DEPEND_PKG([EMOTION], [eio])
4118 4134
4119EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${efl_lib_optional_eeze}], [eeze]) 4135EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EMOTION], [${efl_lib_optional_eeze}], [eeze])
@@ -4189,6 +4205,7 @@ EFL_PLATFORM_DEPEND([EINA], [evil])
4189EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina]) 4205EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eina])
4190EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eet]) 4206EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eet])
4191EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas]) 4207EFL_INTERNAL_DEPEND_PKG([ETHUMB], [evas])
4208EFL_INTERNAL_DEPEND_PKG([ETHUMB], [efl])
4192EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eo]) 4209EFL_INTERNAL_DEPEND_PKG([ETHUMB], [eo])
4193EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore]) 4210EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore])
4194EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas]) 4211EFL_INTERNAL_DEPEND_PKG([ETHUMB], [ecore-evas])
@@ -4231,6 +4248,7 @@ EFL_PLATFORM_DEPEND([ETHUMB_CLIENT], [evil])
4231### Checks for libraries 4248### Checks for libraries
4232EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina]) 4249EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eina])
4233EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo]) 4250EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eo])
4251EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [efl])
4234EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eet]) 4252EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [eet])
4235EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore]) 4253EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [ecore])
4236EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edje]) 4254EFL_INTERNAL_DEPEND_PKG([ETHUMB_CLIENT], [edje])
@@ -4368,6 +4386,7 @@ pc/eo.pc
4368pc/eo-cxx.pc 4386pc/eo-cxx.pc
4369pc/eolian.pc 4387pc/eolian.pc
4370pc/eolian-cxx.pc 4388pc/eolian-cxx.pc
4389pc/efl.pc
4371pc/evas-fb.pc 4390pc/evas-fb.pc
4372pc/evas-opengl-x11.pc 4391pc/evas-opengl-x11.pc
4373pc/evas-opengl-sdl.pc 4392pc/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 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5datarootdir=@datarootdir@
6datadir=@datadir@
7eoincludedir=@datadir@/eolian/include
8eolian_flags=-I${eoincludedir}/efl-@VMAJ@
9
10Name: Efl
11Description: EFL's general purpose library
12Version: @PACKAGE_VERSION@
13Requires.private: @requirements_pc_efl@
14Libs: -L${libdir} -lefl
15Libs.private:
16Cflags: -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 =
24 24
25EFL_INSTALL_EXEC_HOOK= 25EFL_INSTALL_EXEC_HOOK=
26 26
27include Makefile_Efl.am
28
29include Makefile_Evil.am 27include Makefile_Evil.am
30include Makefile_Escape.am 28include Makefile_Escape.am
31 29
32include Makefile_Eina.am 30include Makefile_Eina.am
33include Makefile_Eo.am 31include Makefile_Eo.am
32include Makefile_Efl.am
34include Makefile_Eet.am 33include Makefile_Eet.am
35include Makefile_Eolian.am 34include Makefile_Eolian.am
36include Makefile_Ecore.am 35include 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 = \
24EXTRA_DIST += \ 24EXTRA_DIST += \
25 ${efleolianfiles_DATA} 25 ${efleolianfiles_DATA}
26 26
27lib_LTLIBRARIES += lib/efl/libefl.la
28
29lib_efl_libefl_la_SOURCES = \
30 lib/efl/interfaces/efl_interfaces_main.c
31
32lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EFL_CFLAGS@
33lib_efl_libefl_la_LIBADD = @EFL_LIBS@
34lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@
35lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
36
27installed_eflheadersdir = $(includedir)/efl-@VMAJ@ 37installed_eflheadersdir = $(includedir)/efl-@VMAJ@
28dist_installed_eflheaders_DATA = \ 38dist_installed_eflheaders_DATA = \
29lib/efl/Efl_Config.h 39 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 @@
1#ifndef _EFL_H
2#define _EFL_H
3
4#include <Eo.h>
5
6/* Interfaces */
7#include "interfaces/efl_interface_file.eo.h"
8
9#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 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include <Efl.h>
6
7#include "interfaces/efl_interface_file.eo.c"