summaryrefslogtreecommitdiff
path: root/src/Makefile_Ecore_Evas.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-11 16:57:21 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-11 16:57:21 +0000
commit85f8163c3ee5b5d776d94c70ff9fbc667a615b2a (patch)
tree5428396625bf4a84d287357c6a1e9d576a421b30 /src/Makefile_Ecore_Evas.am
parent9c12a585366c131560582a01e8d28f3acc47c19e (diff)
efl/ecore_evas: merge buffer into core, split extn apart.
buffer is lightweight and dependency for many engines, merge it back into core. extn is a module on its own, and it's the only one linking to ecore_ipc, no need to add that to ecore_evas. minor cosmetic changes to configure to make output consistent. SVN revision: 82648
Diffstat (limited to 'src/Makefile_Ecore_Evas.am')
-rw-r--r--src/Makefile_Ecore_Evas.am29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 79875e0..62cea7f 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -10,11 +10,13 @@ lib/ecore_evas/Ecore_Evas.h
10 10
11lib_ecore_evas_libecore_evas_la_SOURCES = \ 11lib_ecore_evas_libecore_evas_la_SOURCES = \
12lib/ecore_evas/ecore_evas.c \ 12lib/ecore_evas/ecore_evas.c \
13lib/ecore_evas/ecore_evas_buffer.c \
14lib/ecore_evas/ecore_evas_buffer.h \
13lib/ecore_evas/ecore_evas_deprecated.c \ 15lib/ecore_evas/ecore_evas_deprecated.c \
14lib/ecore_evas/ecore_evas_ews.c \ 16lib/ecore_evas/ecore_evas_ews.c \
15lib/ecore_evas/ecore_evas_util.c \
16lib/ecore_evas/ecore_evas_module.c \ 17lib/ecore_evas/ecore_evas_module.c \
17lib/ecore_evas/ecore_evas_private.h 18lib/ecore_evas/ecore_evas_private.h \
19lib/ecore_evas/ecore_evas_util.c
18 20
19lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ 21lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
20-I$(top_srcdir)/src/lib/eina \ 22-I$(top_srcdir)/src/lib/eina \
@@ -37,7 +39,6 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
37lib_ecore_evas_libecore_evas_la_LIBADD = \ 39lib_ecore_evas_libecore_evas_la_LIBADD = \
38lib/ecore_input/libecore_input_evas.la \ 40lib/ecore_input/libecore_input_evas.la \
39lib/ecore_input/libecore_input.la \ 41lib/ecore_input/libecore_input.la \
40lib/ecore_ipc/libecore_ipc.la \
41lib/ecore/libecore.la \ 42lib/ecore/libecore.la \
42lib/evas/libevas.la \ 43lib/evas/libevas.la \
43lib/eo/libeo.la \ 44lib/eo/libeo.la \
@@ -50,18 +51,16 @@ lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
50 51
51# Engines 52# Engines
52 53
53if BUILD_ECORE_EVAS_BUFFER 54if BUILD_ECORE_EVAS_EXTN
54BUFFERSOURCES = \ 55EXTNSOURCES = \
55modules/ecore_evas/engines/buffer/ecore_evas_buffer.c \ 56modules/ecore_evas/engines/extn/ecore_evas_extn.c
56modules/ecore_evas/engines/buffer/ecore_evas_extn.c \ 57ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH)
57modules/ecore_evas/engines/buffer/ecore_evas_buffer_private.h 58ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la
58ecoreevasenginebufferpkgdir = $(libdir)/ecore_evas/engines/buffer/$(MODULE_ARCH) 59modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES)
59ecoreevasenginebufferpkg_LTLIBRARIES = modules/ecore_evas/engines/buffer/module.la 60modules_ecore_evas_engines_extn_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS)
60modules_ecore_evas_engines_buffer_module_la_SOURCES = $(BUFFERSOURCES) 61modules_ecore_evas_engines_extn_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la
61modules_ecore_evas_engines_buffer_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) 62modules_ecore_evas_engines_extn_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
62modules_ecore_evas_engines_buffer_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la 63modules_ecore_evas_engines_extn_module_la_LIBTOOLFLAGS = --tag=disable-static
63modules_ecore_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
64modules_ecore_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
65endif 64endif
66 65
67if BUILD_ECORE_EVAS_X11 66if BUILD_ECORE_EVAS_X11