aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_EDBus.am35
-rw-r--r--src/Makefile_EPhysics.am28
-rw-r--r--src/Makefile_Ecore.am63
-rw-r--r--src/Makefile_Ecore_Audio.am21
-rw-r--r--src/Makefile_Ecore_Cocoa.am20
-rw-r--r--src/Makefile_Ecore_Con.am23
-rw-r--r--src/Makefile_Ecore_Evas.am118
-rw-r--r--src/Makefile_Ecore_FB.am20
-rw-r--r--src/Makefile_Ecore_File.am20
-rw-r--r--src/Makefile_Ecore_Imf.am114
-rw-r--r--src/Makefile_Ecore_Input.am43
-rw-r--r--src/Makefile_Ecore_Ipc.am22
-rw-r--r--src/Makefile_Ecore_Psl1ght.am20
-rw-r--r--src/Makefile_Ecore_SDL.am21
-rw-r--r--src/Makefile_Ecore_Wayland.am20
-rw-r--r--src/Makefile_Ecore_Win32.am23
-rw-r--r--src/Makefile_Ecore_WinCE.am23
-rw-r--r--src/Makefile_Ecore_X.am22
-rw-r--r--src/Makefile_Edje.am91
-rw-r--r--src/Makefile_Eet.am44
-rw-r--r--src/Makefile_Eeze.am90
-rw-r--r--src/Makefile_Efreet.am106
-rw-r--r--src/Makefile_Eina.am74
-rw-r--r--src/Makefile_Eio.am22
-rw-r--r--src/Makefile_Embryo.am27
-rw-r--r--src/Makefile_Emotion.am103
-rw-r--r--src/Makefile_Eo.am122
-rw-r--r--src/Makefile_Escape.am4
-rw-r--r--src/Makefile_Ethumb.am124
-rw-r--r--src/Makefile_Evas.am570
-rw-r--r--src/Makefile_Evil.am33
-rw-r--r--src/lib/ecore_evas/ecore_evas_buffer.c1
-rw-r--r--src/lib/ecore_evas/ecore_evas_ews.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas_private.h4
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c2
35 files changed, 565 insertions, 1510 deletions
diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am
index 600aedf744..4920ae02a3 100644
--- a/src/Makefile_EDBus.am
+++ b/src/Makefile_EDBus.am
@@ -34,22 +34,9 @@ lib/edbus/edbus_message_from_eina_value.c
lib_edbus_libedbus2_la_CPPFLAGS = \
-include $(top_builddir)/config.h \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/edbus \
--DEFL_EDBUS_BUILD \
-@EFL_COV_CFLAGS@ \
@EDBUS_CFLAGS@
-
-lib_edbus_libedbus2_la_LIBADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-@EDBUS_LIBS@ \
-@EFL_COV_LIBS@
-
+lib_edbus_libedbus2_la_LIBADD = @EDBUS_LIBS@
+lib_edbus_libedbus2_la_DEPENDENCIES = @EDBUS_INTERNAL_LIBS@
lib_edbus_libedbus2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Binary
@@ -65,21 +52,9 @@ bin/edbus/source_client.c \
bin/edbus/client.c
bin_edbus_edbus_codegen_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/edbus \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/edbus\" \
-@EDBUS_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-bin_edbus_edbus_codegen_LDADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/edbus/libedbus2.la \
-@EDBUS_LDFLAGS@ \
-@EFL_COV_LIBS@
+@EDBUS_CFLAGS@
+bin_edbus_edbus_codegen_LDADD = @USE_EDBUS_LIBS@
+bin_edbus_edbus_codegen_DEPENDENCIES = @USE_EDBUS_INTERNAL_LIBS@
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
index b30d9092ca..33748effef 100644
--- a/src/Makefile_EPhysics.am
+++ b/src/Makefile_EPhysics.am
@@ -21,31 +21,9 @@ lib/ephysics/ephysics_quaternion.cpp \
lib/ephysics/ephysics_shape.cpp \
lib/ephysics/ephysics_world.cpp
-lib_ephysics_libephysics_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/evas \
--I$(top_builddir)/src/lib/evas \
--I$(top_srcdir)/src/lib/ephysics \
--I$(top_builddir)/src/lib/ephysics \
-@EFL_COV_CFLAGS@ \
-@EPHYSICS_CFLAGS@ \
-@USE_EVIL_CFLAGS@ \
--DEFL_EPHYSICS_BUILD
-
-lib_ephysics_libephysics_la_LIBADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/evas/libevas.la \
-@EFL_COV_LIBS@ \
-@USE_EVIL_LIBS@ \
-@EPHYSICS_LIBS@
-
+lib_ephysics_libephysics_la_CPPFLAGS = @EPHYSICS_CFLAGS@
+lib_ephysics_libephysics_la_LIBADD = @EPHYSICS_LIBS@
+lib_ephysics_libephysics_la_DEPENDENCIES = @EPHYSICS_INTERNAL_LIBS@
lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 1d3a6a72cd..97bb235519 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -48,25 +48,9 @@ lib_ecore_libecore_la_SOURCES += lib/ecore/ecore_signal.c lib/ecore/ecore_exe.c
endif
endif
-lib_ecore_libecore_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--DEFL_ECORE_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_CFLAGS@ \
-@USE_EVIL_CFLAGS@ \
-@USE_ESCAPE_CFLAGS@
-
-lib_ecore_libecore_la_LIBADD = \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@USE_EVIL_LIBS@ \
-@USE_ESCAPE_LIBS@ \
-@ECORE_LIBS@ \
-@EFL_COV_LIBS@
-
+lib_ecore_libecore_la_CPPFLAGS = @ECORE_CFLAGS@
+lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@
+lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Unit tests
@@ -84,32 +68,33 @@ tests/ecore/ecore_test_ecore_imf.c \
tests/ecore/ecore_suite.h
tests_ecore_ecore_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_audio \
--I$(top_srcdir)/src/lib/ecore_con \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--I$(top_srcdir)/src/lib/ecore_imf \
--I$(top_builddir)/src/lib/ecore_imf \
-DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
-@CHECK_CFLAGS@
+@CHECK_CFLAGS@ \
+@ECORE_CFLAGS@ \
+@ECORE_AUDIO_CFLAGS@ \
+@ECORE_CON_CFLAGS@ \
+@ECORE_FILE_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
+@ECORE_IMF_CFLAGS@
tests_ecore_ecore_suite_LDADD = \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore_con/libecore_con.la \
-lib/ecore_file/libecore_file.la \
-lib/ecore/libecore.la \
-lib/eina/libeina.la \
-@ECORE_LDFLAGS@ \
-@CHECK_LIBS@
+@CHECK_LIBS@ \
+@USE_ECORE_LIBS@ \
+@USE_ECORE_AUDIO_LIBS@ \
+@USE_ECORE_CON_LIBS@ \
+@USE_ECORE_FILE_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@USE_ECORE_IMF_LIBS@
+tests_ecore_ecore_suite_DEPENDENCIES = \
+@USE_ECORE_INTERNAL_LIBS@ \
+@USE_ECORE_AUDIO_INTERNAL_LIBS@ \
+@USE_ECORE_CON_INTERNAL_LIBS@ \
+@USE_ECORE_FILE_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@ \
+@USE_ECORE_IMF_INTERNAL_LIBS@
if HAVE_ECORE_AUDIO
tests_ecore_ecore_suite_SOURCES += tests/ecore/ecore_test_ecore_audio.c
-tests_ecore_ecore_suite_LDADD += lib/ecore_audio/libecore_audio.la
endif
endif
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index d2a19a11ac..d22430c9ab 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -17,24 +17,9 @@ lib/ecore_audio/ecore_audio_tone.c \
lib/ecore_audio/ecore_audio_custom.c \
lib/ecore_audio/ecore_audio_private.h
-lib_ecore_audio_libecore_audio_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/ecore \
--DEFL_ECORE_AUDIO_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_AUDIO_CFLAGS@
-
-lib_ecore_audio_libecore_audio_la_LIBADD = \
-lib/ecore/libecore.la \
-lib/eet/libeet.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_AUDIO_LIBS@ \
-@EFL_COV_LIBS@
-
+lib_ecore_audio_libecore_audio_la_CPPFLAGS = @ECORE_AUDIO_CFLAGS@
+lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@
+lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am
index b7fe49a185..10b7cd2fb8 100644
--- a/src/Makefile_Ecore_Cocoa.am
+++ b/src/Makefile_Ecore_Cocoa.am
@@ -14,22 +14,8 @@ lib/ecore_cocoa/ecore_cocoa.m \
lib/ecore_cocoa/ecore_cocoa_window.m \
lib/ecore_cocoa/ecore_cocoa_private.h
-lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_cocoa \
-@ECORE_COCOA_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_cocoa_libecore_cocoa_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_COCOA_LIBS@
-
+lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = @ECORE_COCOA_CFLAGS@
+lib_ecore_cocoa_libecore_cocoa_la_LIBADD = @ECORE_COCOA_LIBS@
+lib_ecore_cocoa_libecore_cocoa_la_DEPENDENCIES = @ECORE_COCOA_INTERNAL_LIBS@
lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index dbbfa1dd31..549a64d169 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -33,24 +33,7 @@ lib_ecore_con_libecore_con_la_SOURCES += lib/ecore_con/ecore_con_info.c
endif
endif
-lib_ecore_con_libecore_con_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_con \
--DEFL_ECORE_CON_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_CON_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-lib_ecore_con_libecore_con_la_LIBADD = \
-lib/ecore/libecore.la \
-lib/eet/libeet.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@USE_EVIL_LIBS@
-
-lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@
+lib_ecore_con_libecore_con_la_CPPFLAGS = @ECORE_CON_CFLAGS@
+lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@
+lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 62cea7fcd1..6dfd6c4bc1 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -19,34 +19,12 @@ lib/ecore_evas/ecore_evas_private.h \
lib/ecore_evas/ecore_evas_util.c
lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_ipc \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_input_evas \
--I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_srcdir)/src/modules/evas/engines/buffer \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
--DEFL_ECORE_EVAS_BUILD \
-@ECORE_EVAS_CFLAGS@ \
-@EFL_COV_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-lib_ecore_evas_libecore_evas_la_LIBADD = \
-lib/ecore_input/libecore_input_evas.la \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/evas/libevas.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_EVAS_LIBS@ \
-@EFL_COV_LIBS@
-
-lib_ecore_evas_libecore_evas_la_LIBADD += @EFL_COV_LIBS@
+@ECORE_EVAS_CFLAGS@
+lib_ecore_evas_libecore_evas_la_LIBADD = @ECORE_EVAS_LIBS@
+lib_ecore_evas_libecore_evas_la_DEPENDENCIES = @ECORE_EVAS_INTERNAL_LIBS@
lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# Engines
@@ -57,8 +35,16 @@ modules/ecore_evas/engines/extn/ecore_evas_extn.c
ecoreevasengineextnpkgdir = $(libdir)/ecore_evas/engines/extn/$(MODULE_ARCH)
ecoreevasengineextnpkg_LTLIBRARIES = modules/ecore_evas/engines/extn/module.la
modules_ecore_evas_engines_extn_module_la_SOURCES = $(EXTNSOURCES)
-modules_ecore_evas_engines_extn_module_la_CPPFLAGS = $(lib_ecore_evas_libecore_evas_la_CPPFLAGS)
-modules_ecore_evas_engines_extn_module_la_LIBADD = lib/ecore_ipc/libecore_ipc.la lib/ecore_evas/libecore_evas.la
+modules_ecore_evas_engines_extn_module_la_CPPFLAGS = \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_IPC_CFLAGS@ \
+-I$(top_srcdir)/src/modules/evas/engines/buffer
+modules_ecore_evas_engines_extn_module_la_LIBADD = \
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_IPC_LIBS@
+modules_ecore_evas_engines_extn_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_IPC_INTERNAL_LIBS@
modules_ecore_evas_engines_extn_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_extn_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -69,14 +55,16 @@ ecoreevasenginexpkgdir = $(libdir)/ecore_evas/engines/x/$(MODULE_ARCH)
ecoreevasenginexpkg_LTLIBRARIES = modules/ecore_evas/engines/x/module.la
modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES)
modules_ecore_evas_engines_x_module_la_CPPFLAGS = \
-$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_X_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
-I$(top_srcdir)/src/modules/evas/engines/gl_x11
modules_ecore_evas_engines_x_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_x/libecore_x.la
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_X_LIBS@
+modules_ecore_evas_engines_x_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@
modules_ecore_evas_engines_x_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_x_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -87,12 +75,15 @@ ecoreevasenginecocoapkgdir = $(libdir)/ecore_evas/engines/cocoa/$(MODULE_ARCH)
ecoreevasenginecocoapkg_LTLIBRARIES = modules/ecore_evas/engines/cocoa/module.la
modules_ecore_evas_engines_cocoa_module_la_SOURCES = $(COCOASOURCES)
modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \
-$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
--I$(top_srcdir)/src/lib/ecore_cocoa \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_COCOA_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/gl_cocoa
modules_ecore_evas_engines_cocoa_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_cocoa/libecore_cocoa.la
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_COCOA_LIBS@
+modules_ecore_evas_engines_cocoa_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_COCOA_INTERNAL_LIBS@
modules_ecore_evas_engines_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -103,12 +94,15 @@ ecoreevasenginefbpkgdir = $(libdir)/ecore_evas/engines/fb/$(MODULE_ARCH)
ecoreevasenginefbpkg_LTLIBRARIES = modules/ecore_evas/engines/fb/module.la
modules_ecore_evas_engines_fb_module_la_SOURCES = $(FBSOURCES)
modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \
-$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
--I$(top_srcdir)/src/lib/ecore_fb \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_FB_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/fb
modules_ecore_evas_engines_fb_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_fb/libecore_fb.la
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_FB_LIBS@
+modules_ecore_evas_engines_fb_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_FB_INTERNAL_LIBS@
modules_ecore_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -119,12 +113,15 @@ ecoreevasenginepsl1ghtpkgdir = $(libdir)/ecore_evas/engines/psl1ght/$(MODULE_ARC
ecoreevasenginepsl1ghtpkg_LTLIBRARIES = modules/ecore_evas/engines/psl1ght/module.la
modules_ecore_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHTSOURCES)
modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \
-$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
--I$(top_srcdir)/src/lib/ecore_psl1ght \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_PSL1GHT_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/psl1ght
modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_psl1ght/libecore_psl1ght.la
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_PSL1GHT_LIBS@
+modules_ecore_evas_engines_psl1ght_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_PSL1GHT_INTERNAL_LIBS@
modules_ecore_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -139,14 +136,17 @@ ecoreevasenginewaylandpkgdir = $(libdir)/ecore_evas/engines/wayland/$(MODULE_ARC
ecoreevasenginewaylandpkg_LTLIBRARIES = modules/ecore_evas/engines/wayland/module.la
modules_ecore_evas_engines_wayland_module_la_SOURCES = $(WAYLANDSOURCES)
modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = \
-$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
--I$(top_srcdir)/src/lib/ecore_wayland \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_WAYLAND_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
-I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
@ECORE_WAYLAND_CFLAGS@
modules_ecore_evas_engines_wayland_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_wayland/libecore_wayland.la
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_WAYLAND_LIBS@
+modules_ecore_evas_engines_wayland_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_WAYLAND_INTERNAL_LIBS@
modules_ecore_evas_engines_wayland_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_wayland_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -158,12 +158,15 @@ ecoreevasenginesdlpkgdir = $(libdir)/ecore_evas/engines/sdl/$(MODULE_ARCH)
ecoreevasenginesdlpkg_LTLIBRARIES = modules/ecore_evas/engines/sdl/module.la
modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES)
modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \
-$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
--I$(top_srcdir)/src/lib/ecore_sdl \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_SDL_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/gl_sdl
modules_ecore_evas_engines_sdl_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_sdl/libecore_sdl.la
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_SDL_LIBS@
+modules_ecore_evas_engines_sdl_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_SDL_INTERNAL_LIBS@
modules_ecore_evas_engines_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -175,13 +178,16 @@ ecoreevasengineswin32pkgdir = $(libdir)/ecore_evas/engines/win32/$(MODULE_ARCH)
ecoreevasengineswin32pkg_LTLIBRARIES = modules/ecore_evas/engines/win32/module.la
modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES)
modules_ecore_evas_engines_win32_module_la_CPPFLAGS = \
-$(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \
--I$(top_srcdir)/src/lib/ecore_win32 \
+@ECORE_EVAS_CFLAGS@ \
+@ECORE_WIN32_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
-I$(top_srcdir)/src/modules/evas/engines/software_gdi
modules_ecore_evas_engines_win32_module_la_LIBADD = \
-lib/ecore/libecore_evas.la \
-lib/ecore_win32/libecore_win32.la
+@USE_ECORE_EVAS_LIBS@ \
+@USE_ECORE_WIN32_LIBS@
+modules_ecore_evas_engines_win32_module_la_DEPENDENCIES = \
+@USE_ECORE_EVAS_INTERNAL_LIBS@ \
+@USE_ECORE_WIN32_INTERNAL_LIBS@
modules_ecore_evas_engines_win32_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_evas_engines_win32_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am
index 4c84b2e96f..7f40863d87 100644
--- a/src/Makefile_Ecore_FB.am
+++ b/src/Makefile_Ecore_FB.am
@@ -16,22 +16,8 @@ lib/ecore_fb/ecore_fb_vt.c \
lib/ecore_fb/ecore_fb_keytable.h \
lib/ecore_fb/ecore_fb_private.h
-lib_ecore_fb_libecore_fb_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_fb \
-@EFL_COV_CFLAGS@ \
-@ECORE_FB_CFLAGS@
-
-lib_ecore_fb_libecore_fb_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_FB_LIBS@
-
+lib_ecore_fb_libecore_fb_la_CPPFLAGS = @ECORE_FB_CFLAGS@
+lib_ecore_fb_libecore_fb_la_LIBADD = @ECORE_FB_LIBS@
+lib_ecore_fb_libecore_fb_la_DEPENDENCIES = @ECORE_FB_INTERNAL_LIBS@
lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index 8dfa6f320a..27dbe33b91 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -27,21 +27,7 @@ lib/ecore_file/ecore_file_monitor_poll.c
endif
endif
-lib_ecore_file_libecore_file_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_con \
--I$(top_srcdir)/src/lib/ecore_file \
--DEFL_ECORE_FILE_BUILD \
-@ECORE_FILE_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_file_libecore_file_la_LIBADD = \
-lib/ecore_con/libecore_con.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@
+lib_ecore_file_libecore_file_la_CPPFLAGS = @ECORE_FILE_CFLAGS@
+lib_ecore_file_libecore_file_la_LIBADD = @ECORE_FILE_LIBS@
+lib_ecore_file_libecore_file_la_DEPENDENCIES = @ECORE_FILE_INTERNAL_LIBS@
lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index aaf5957c5e..e410f00521 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -16,54 +16,23 @@ lib/ecore_imf/ecore_imf_module.c \
lib/ecore_imf/ecore_imf_private.h
lib_ecore_imf_libecore_imf_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_imf \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
--DEFL_ECORE_IMF_BUILD \
-@ECORE_IMF_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_imf_libecore_imf_la_LIBADD = \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@
-
+@ECORE_IMF_CFLAGS@
+lib_ecore_imf_libecore_imf_la_LIBADD = @ECORE_IMF_LIBS@
+lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@
lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@
dist_installed_ecoreimfevasmainheaders_DATA = \
lib/ecore_imf/Ecore_IMF_Evas.h
-lib_ecore_imf_libecore_imf_evas_la_SOURCES = \
-lib/ecore_imf/ecore_imf_evas.c
-
-lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_imf \
--I$(top_srcdir)/src/lib/ecore_imf_evas \
--DEFL_ECORE_IMF_EVAS_BUILD \
-@ECORE_IMF_EVAS_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_imf_libecore_imf_evas_la_LIBADD = \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore/libecore.la \
-lib/evas/libevas.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@
-
+lib_ecore_imf_libecore_imf_evas_la_SOURCES = lib/ecore_imf/ecore_imf_evas.c
+lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = @ECORE_IMF_EVAS_CFLAGS@
+lib_ecore_imf_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
+lib_ecore_imf_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -79,28 +48,12 @@ modules/ecore_imf/ibus/ibus_module.c \
modules/ecore_imf/ibus/ibus_imcontext.c \
modules/ecore_imf/ibus/ibus_imcontext.h
modules_ecore_imf_ibus_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--I$(top_srcdir)/src/lib/ecore_imf \
--I$(top_srcdir)/src/lib/ecore_evas \
--I$(top_srcdir)/src/lib/evas \
@ECORE_IMF_CFLAGS@ \
-@EFL_COV_CFLAGS@ \
@IBUS_CFLAGS@
modules_ecore_imf_ibus_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore_x/libecore_x.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@IBUS_LIBS@ \
-@EFL_COV_LIBS@
+@USE_ECORE_IMF_LIBS@ \
+@IBUS_LIBS@
+modules_ecore_imf_ibus_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@
modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -115,28 +68,12 @@ modules/ecore_imf/scim/scim_module.cpp \
modules/ecore_imf/scim/scim_imcontext.cpp \
modules/ecore_imf/scim/scim_imcontext.h
modules_ecore_imf_scim_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--I$(top_srcdir)/src/lib/ecore_imf \
--I$(top_srcdir)/src/lib/ecore_evas \
--I$(top_srcdir)/src/lib/evas \
@ECORE_IMF_CFLAGS@ \
-@EFL_COV_CFLAGS@ \
@SCIM_CFLAGS@
modules_ecore_imf_scim_module_la_LIBADD = \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore_x/libecore_x.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@SCIM_LIBS@ \
-@EFL_COV_LIBS@
+@USE_ECORE_IMF_LIBS@ \
+@SCIM_LIBS@
+modules_ecore_imf_scim_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@
modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -149,25 +86,16 @@ ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/module.la
modules_ecore_imf_xim_module_la_SOURCES = \
modules/ecore_imf/xim/ecore_imf_xim.c
modules_ecore_imf_xim_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--I$(top_srcdir)/src/lib/ecore_imf \
@ECORE_IMF_CFLAGS@ \
-@ecore_imf_xim_cflags@ \
-@EFL_COV_CFLAGS@
+@ECORE_X_CFLAGS@ \
+@ecore_imf_xim_cflags@
modules_ecore_imf_xim_module_la_LIBADD = \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore_x/libecore_x.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ecore_imf_xim_libs@ \
-@EFL_COV_LIBS@
+@USE_ECORE_IMF_LIBS@ \
+@USE_ECORE_X_LIBS@ \
+@ecore_imf_xim_libs@
+modules_ecore_imf_xim_module_la_DEPENDENCIES = \
+@USE_ECORE_IMF_INTERNAL_LIBS@ \
+@USE_ECORE_X_INTERNAL_LIBS@
modules_ecore_imf_xim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_imf_xim_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index 765616aa09..d07a895d5a 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -15,23 +15,9 @@ lib/ecore_input/ecore_input_compose.c \
lib/ecore_input/ecore_input_compose.h \
lib/ecore_input/ecore_input_private.h
-lib_ecore_input_libecore_input_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--DEFL_ECORE_INPUT_BUILD \
-@ECORE_INPUT_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_input_libecore_input_la_LIBADD = \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@
-
-lib_ecore_input_libecore_input_la_LIBADD += @EFL_COV_LIBS@
+lib_ecore_input_libecore_input_la_CPPFLAGS = @ECORE_INPUT_CFLAGS@
+lib_ecore_input_libecore_input_la_LIBADD = @ECORE_INPUT_LIBS@
+lib_ecore_input_libecore_input_la_DEPENDENCIES = @ECORE_INPUT_INTERNAL_LIBS@
lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@
@@ -42,24 +28,7 @@ lib_ecore_input_libecore_input_evas_la_SOURCES = \
lib/ecore_input/ecore_input_evas.c \
lib/ecore_input/ecore_input_evas_private.h
-lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_input_evas \
--DEFL_ECORE_INPUT_EVAS_BUILD \
-@ECORE_INPUT_EVAS_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_input_libecore_input_evas_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/evas/libevas.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@
-
+lib_ecore_input_libecore_input_evas_la_CPPFLAGS = @ECORE_INPUT_EVAS_CFLAGS@
+lib_ecore_input_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
+lib_ecore_input_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
lib_ecore_input_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 13a7efb045..ca490759b9 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -11,23 +11,7 @@ lib_ecore_ipc_libecore_ipc_la_SOURCES = \
lib/ecore_ipc/ecore_ipc.c \
lib/ecore_ipc/ecore_ipc_private.h
-lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_con \
--I$(top_srcdir)/src/lib/ecore_ipc \
--DEFL_ECORE_IPC_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_IPC_CFLAGS@
-
-lib_ecore_ipc_libecore_ipc_la_LIBADD = \
-lib/ecore_con/libecore_con.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@EFL_COV_LIBS@ \
-@ECORE_IPC_LIBS@
-
+lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = @ECORE_IPC_CFLAGS@
+lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@
+lib_ecore_ipc_libecore_ipc_la_DEPENDENCIES = @ECORE_IPC_INTERNAL_LIBS@
lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am
index 3364a1e18b..607ce47f0d 100644
--- a/src/Makefile_Ecore_Psl1ght.am
+++ b/src/Makefile_Ecore_Psl1ght.am
@@ -17,23 +17,9 @@ lib/ecore_psl1ght/spursutil.h \
lib/ecore_psl1ght/Ecore_Psl1ght_Keys.h \
lib/ecore_psl1ght/ecore_psl1ght_private.h
-lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_psl1ght \
--DEFL_ECORE_PSL1GHT_BUILD \
-@ECORE_PSL1GHT_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la
-
+lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = @ECORE_PSL1GHT_CFLAGS@
+lib_ecore_psl1ght_libecore_psl1ght_la_LIBADD = @ECORE_PSL1GHT_LIBS@
+lib_ecore_psl1ght_libecore_psl1ght_la_DEPENDENCIES = @ECORE_PSL1GHT_INTERNAL_LIBS@
lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am
index deaacbe077..160dd32810 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -13,23 +13,8 @@ lib/ecore_sdl/ecore_sdl.c \
lib/ecore_sdl/Ecore_Sdl_Keys.h \
lib/ecore_sdl/ecore_sdl_private.h
-lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_sdl \
--DEFL_ECORE_SDL_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_SDL_CFLAGS@
-
-lib_ecore_sdl_libecore_sdl_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_SDL_LIBS@
-
+lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = @ECORE_SDL_CFLAGS@
+lib_ecore_sdl_libecore_sdl_la_LIBADD = @ECORE_SDL_LIBS@
+lib_ecore_sdl_libecore_sdl_la_DEPENDENCIES = @ECORE_SDL_INTERNAL_LIBS@
lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index 9afeda230d..88ffccf8e1 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -16,22 +16,8 @@ lib/ecore_wayland/ecore_wl_output.c \
lib/ecore_wayland/ecore_wl_window.c \
lib/ecore_wayland/ecore_wl_private.h
-lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_wayland \
-@EFL_COV_CFLAGS@ \
-@ECORE_WAYLAND_CFLAGS@
-
-lib_ecore_wayland_libecore_wayland_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_WAYLAND_LIBS@
-
+lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = @ECORE_WAYLAND_CFLAGS@
+lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@
+lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@
lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index c6fbdf6161..081b28b182 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -24,25 +24,8 @@ lib/ecore_win32/ecore_win32_dnd_data_object.h \
lib/ecore_win32/ecore_win32_dnd_drop_source.h \
lib/ecore_win32/ecore_win32_dnd_drop_target.h
-lib_ecore_win32_libecore_win32_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_win32 \
--DEFL_ECORE_WIN32_BUILD \
-@ECORE_WIN32_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_win32_libecore_win32_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-lib/evil/libevil.la \
-@ECORE_WIN32_LIBS@
-
+lib_ecore_win32_libecore_win32_la_CPPFLAGS = @ECORE_WIN32_CFLAGS@
+lib_ecore_win32_libecore_win32_la_LIBADD = @ECORE_WIN32_LIBS@
+lib_ecore_win32_libecore_win32_la_DEPENDENCIES = @ECORE_WIN32_INTERNAL_LIBS@
lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am
index 40adb9c1e1..9dbf447a38 100644
--- a/src/Makefile_Ecore_WinCE.am
+++ b/src/Makefile_Ecore_WinCE.am
@@ -14,25 +14,8 @@ lib/ecore_wince/ecore_wince_event.c \
lib/ecore_wince/ecore_wince_window.c \
lib/ecore_wince/ecore_wince_private.h
-lib_ecore_wince_libecore_wince_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_wince \
--DEFL_ECORE_WINCE_BUILD \
-@ECORE_WINCE_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_ecore_wince_libecore_wince_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-lib/evil/libevil.la \
-@ECORE_WINCE_LIBS@
-
+lib_ecore_wince_libecore_wince_la_CPPFLAGS = @ECORE_WINCE_CFLAGS@
+lib_ecore_wince_libecore_wince_la_LIBADD = @ECORE_WINCE_LIBS@
+lib_ecore_wince_libecore_wince_la_DEPENDENCIES = @ECORE_WINCE_INTERNAL_LIBS@
lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index eea0a17f3a..017658e05e 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -96,25 +96,9 @@ lib/ecore_x/xlib/ecore_x_gesture.c \
lib/ecore_x/xlib/ecore_x_private.h
endif
-lib_ecore_x_libecore_x_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--DEFL_ECORE_X_BUILD \
-@EFL_COV_CFLAGS@ \
-@ECORE_X_CFLAGS@
-
-lib_ecore_x_libecore_x_la_LIBADD = \
-lib/ecore_input/libecore_input.la \
-lib/ecore/libecore.la \
-lib/eo/libeo.la \
-lib/eina/libeina.la \
-@ECORE_X_LIBS@
-
+lib_ecore_x_libecore_x_la_CPPFLAGS = @ECORE_X_CFLAGS@
+lib_ecore_x_libecore_x_la_LIBADD = @ECORE_X_LIBS@
+lib_ecore_x_libecore_x_la_DEPENDENCIES = @ECORE_X_INTERNAL_LIBS@
lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
MAINTAINERCLEANFILES += \
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index ce31a03d92..d46ae08c00 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -4,62 +4,12 @@
lib_LTLIBRARIES += lib/edje/libedje.la
EDJE_COMMON_CPPFLAGS = \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
--I$(top_builddir)/src/lib/evas \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_evas \
--I$(top_builddir)/src/lib/ecore_evas \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_builddir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_builddir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_imf \
--I$(top_builddir)/src/lib/ecore_imf \
--I$(top_srcdir)/src/lib/embryo \
--I$(top_builddir)/src/lib/embryo \
--I$(top_srcdir)/src/lib/eio \
--I$(top_builddir)/src/lib/eio \
--I$(top_srcdir)/src/lib/ephysics \
--I$(top_builddir)/src/lib/ephysics \
--I$(top_srcdir)/src/lib/edje \
--I$(top_builddir)/src/lib/edje \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
--DEFL_EDJE_BUILD \
-@EFL_COV_CFLAGS@ \
-@EDJE_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-EDJE_COMMON_LIBS = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/eet/libeet.la \
-lib/evas/libevas.la \
-lib/ecore/libecore.la \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_file/libecore_file.la \
-lib/ecore_input/libecore_input.la \
-lib/ecore_imf/libecore_imf.la \
-lib/ecore_imf/libecore_imf_evas.la \
-lib/embryo/libembryo.la \
-lib/eio/libeio.la \
-@USE_EVIL_LIBS@ \
-@EFL_COV_LIBS@
-
-if HAVE_EPHYSICS
-EDJE_COMMON_LIBS += lib/ephysics/libephysics.la
-endif
+@EDJE_CFLAGS@
installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@
dist_installed_edjemainheaders_DATA = \
@@ -99,7 +49,8 @@ lib/edje/edje_util.c \
lib/edje/edje_var.c
lib_edje_libedje_la_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-lib_edje_libedje_la_LIBADD = $(EDJE_COMMON_LIBS) @EDJE_LIBS@
+lib_edje_libedje_la_LIBADD = @EDJE_LIBS@
+lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@
lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if ENABLE_MULTISENSE
@@ -130,11 +81,6 @@ endif
### Binary
-EDJE_COMMON_USER_LDADD = \
-$(EDJE_COMMON_LIBS) \
-lib/edje/libedje.la \
-@EDJE_LDFLAGS@
-
bin_PROGRAMS += \
bin/edje/edje_cc \
bin/edje/edje_decc \
@@ -156,7 +102,8 @@ bin/edje/edje_cc_handlers.c \
bin/edje/edje_cc_sources.c \
bin/edje/edje_multisense_convert.c
bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_cc_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_cc_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_cc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_decc_SOURCES = \
bin/edje/edje_decc.c \
@@ -164,31 +111,38 @@ bin/edje/edje_decc.h \
bin/edje/edje_cc_mem.c \
bin/edje/edje_cc_sources.c
bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_decc_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_decc_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_player_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_player_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_inspector_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_inspector_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_external_inspector_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_external_inspector_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_codegen_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_codegen_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_pick_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_pick_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
-bin_edje_edje_watch_LDADD = $(EDJE_COMMON_USER_LDADD)
+bin_edje_edje_watch_LDADD = @USE_EDJE_LIBS@
+bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
# EPP (Edje's CPP)
eppdir = $(libdir)/edje/utils/$(MODULE_ARCH)
@@ -252,11 +206,8 @@ tests/edje/edje_suite.h
tests_edje_edje_suite_CPPFLAGS = \
$(EDJE_COMMON_CPPFLAGS) \
@CHECK_CFLAGS@
-
-tests_edje_edje_suite_LDADD = \
-$(EDJE_COMMON_USER_LDADD) \
-@CHECK_LIBS@
-
+tests_edje_edje_suite_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@
+tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
endif
# Useful to other modules that generate EDJ
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 0b238debd0..63142dc366 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -23,24 +23,13 @@ static_libs/lz4/lz4hc.c \
static_libs/lz4/lz4hc.h
lib_eet_libeet_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
-I$(top_srcdir)/src/static_libs/lz4 \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
--DEFL_EET_BUILD \
-@EFL_COV_CFLAGS@ \
-@EET_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-lib_eet_libeet_la_LIBADD = \
-lib/eina/libeina.la \
-@USE_EVIL_LIBS@ \
-@EET_LIBS@ \
-@EFL_COV_LIBS@
-
+@EET_CFLAGS@
+lib_eet_libeet_la_LIBADD = @EET_LIBS@
+lib_eet_libeet_la_DEPENDENCIES = @EET_INTERNAL_LIBS@
lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
EXTRA_DIST += static_libs/lz4/README
@@ -52,22 +41,13 @@ bin_PROGRAMS += bin/eet/eet
bin_eet_eet_SOURCES = bin/eet/eet_main.c
bin_eet_eet_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
-@EFL_COV_CFLAGS@ \
-@EET_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@EET_CFLAGS@
-bin_eet_eet_LDADD = \
-lib/eet/libeet.la \
-lib/eina/libeina.la \
-@USE_EVIL_LIBS@ \
-@EET_LDFLAGS@ \
-@EFL_COV_LIBS@
+bin_eet_eet_LDADD = @USE_EET_LIBS@
+bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
### Unit tests
@@ -81,20 +61,12 @@ tests/eet/eet_data_suite.c \
tests/eet/eet_suite.h
tests_eet_eet_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eet \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet\" \
@CHECK_CFLAGS@ \
@EET_CFLAGS@
-
-tests_eet_eet_suite_LDADD = \
-lib/eet/libeet.la \
-lib/eina/libeina.la \
-@CHECK_LIBS@ \
-@EET_LDFLAGS@
-
+tests_eet_eet_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
+tests_eet_eet_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
endif
EXTRA_DIST += \
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 3429b0282c..3c13c7abf4 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -5,30 +5,6 @@ if HAVE_EEZE
lib_LTLIBRARIES += \
lib/eeze/libeeze.la
-EEZE_COMMON_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_builddir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/ecore_con \
--I$(top_builddir)/src/lib/ecore_con \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet \
--I$(top_srcdir)/src/lib/eeze \
--I$(top_builddir)/src/lib/eeze \
-@EFL_COV_CFLAGS@ \
-@EEZE_CFLAGS@
-
-EEZE_COMMON_LDADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-@EFL_COV_LIBS@
-
installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@
dist_installed_eezemainheaders_DATA = \
lib/eeze/Eeze.h \
@@ -57,27 +33,16 @@ lib/eeze/eeze_disk_udev.c \
lib/eeze/eeze_disk_mount.c \
lib/eeze/eeze_disk_private.h \
lib/eeze/eeze_disk_libmount_new.c
-
-EEZE_COMMON_LDADD += \
-lib/ecore_file/libecore_file.la \
-lib/ecore_con/libecore_con.la \
-lib/eet/libeet.la
endif
-EEZE_COMMON_LIBADD = $(EEZE_COMMON_LDADD) @EEZE_LIBS@
-EEZE_COMMON_LDADD += @EEZE_LDFLAGS@
-EEZE_COMMON_USER_LIBADD = $(EEZE_COMMON_LIBADD) lib/eeze/libeeze.la
-EEZE_COMMON_USER_LDADD = $(EEZE_COMMON_LDADD) lib/eeze/libeeze.la
-
lib_eeze_libeeze_la_CPPFLAGS = \
-$(EEZE_COMMON_CPPFLAGS) \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
--DEFL_EEZE_BUILD
-
-lib_eeze_libeeze_la_LIBADD = $(EEZE_COMMON_LIBADD)
+@EEZE_CFLAGS@
+lib_eeze_libeeze_la_LIBADD = @EEZE_LIBS@
+lib_eeze_libeeze_la_DEPENDENCIES = @EEZE_INTERNAL_LIBS@
lib_eeze_libeeze_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if HAVE_EEZE_TIZEN
@@ -86,20 +51,21 @@ eezemodulesensortizen_LTLIBRARIES = modules/eeze/sensor/tizen/module.la
modules_eeze_sensor_tizen_module_la_SOURCES = \
modules/eeze/sensor/tizen/tizen.c
modules_eeze_sensor_tizen_module_la_CPPFLAGS = \
-$(EEZE_COMMON_CPPFLAGS) \
+@EEZE_CFLAGS@ \
@TIZEN_SENSOR_CFLAGS@
modules_eeze_sensor_tizen_module_la_LIBADD = \
-$(EEZE_COMMON_USER_LIBADD) \
+@USE_EEZE_LIBS@ \
@TIZEN_SENSOR_LIBS@
+modules_eeze_sensor_tizen_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
modules_eeze_sensor_tizen_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eeze_sensor_tizen_module_la_LIBTOOLFLAGS = --tag=disable-static
else
eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH)
eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la
-modules_eeze_sensor_fake_module_la_SOURCES = \
-modules/eeze/sensor/fake/fake.c
-modules_eeze_sensor_fake_module_la_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
-modules_eeze_sensor_fake_module_la_LIBADD = $(EEZE_COMMON_USER_LIBADD)
+modules_eeze_sensor_fake_module_la_SOURCES = modules/eeze/sensor/fake/fake.c
+modules_eeze_sensor_fake_module_la_CPPFLAGS = @EEZE_CFLAGS@
+modules_eeze_sensor_fake_module_la_LIBADD = @USE_EEZE_LIBS@
+modules_eeze_sensor_fake_module_la_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eeze_sensor_fake_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -111,12 +77,14 @@ bin/eeze/eeze_udev_test \
bin/eeze/eeze_sensor_test
bin_eeze_eeze_udev_test_SOURCES = bin/eeze/eeze_udev_test.c
-bin_eeze_eeze_udev_test_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
-bin_eeze_eeze_udev_test_LDADD = $(EEZE_COMMON_USER_LDADD)
+bin_eeze_eeze_udev_test_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_udev_test_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_udev_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
bin_eeze_eeze_sensor_test_SOURCES = bin/eeze/eeze_sensor_test.c
-bin_eeze_eeze_sensor_test_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
-bin_eeze_eeze_sensor_test_LDADD = $(EEZE_COMMON_USER_LDADD)
+bin_eeze_eeze_sensor_test_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
if HAVE_EEZE_MOUNT
bin_PROGRAMS += \
@@ -126,22 +94,26 @@ bin/eeze/eeze_disk_ls \
bin/eeze/eeze_scanner
bin_eeze_eeze_mount_SOURCES = bin/eeze/eeze_mount.c
-bin_eeze_eeze_mount_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
-bin_eeze_eeze_mount_LDADD = $(EEZE_COMMON_USER_LDADD)
+bin_eeze_eeze_mount_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_mount_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_mount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
bin_eeze_eeze_umount_SOURCES = bin/eeze/eeze_umount.c
-bin_eeze_eeze_umount_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
-bin_eeze_eeze_umount_LDADD = $(EEZE_COMMON_USER_LDADD)
+bin_eeze_eeze_umount_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_umount_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_umount_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
bin_eeze_eeze_disk_ls_SOURCES = bin/eeze/eeze_disk_ls.c
-bin_eeze_eeze_disk_ls_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
-bin_eeze_eeze_disk_ls_LDADD = $(EEZE_COMMON_USER_LDADD)
+bin_eeze_eeze_disk_ls_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_disk_ls_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_disk_ls_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
bin_eeze_eeze_scanner_SOURCES = \
bin/eeze/eeze_scanner.c \
bin/eeze/eeze_scanner.h
-bin_eeze_eeze_scanner_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
-bin_eeze_eeze_scanner_LDADD = $(EEZE_COMMON_USER_LDADD)
+bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@
+bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
+bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
endif
setuid_root_mode = a=rx,u+xs
@@ -158,9 +130,9 @@ check_PROGRAMS += tests/eeze/eeze_suite
tests_eeze_eeze_suite_SOURCES = tests/eeze/eeze_suite.c
tests_eeze_eeze_suite_CPPFLAGS = \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eeze\" \
-$(EEZE_COMMON_CPPFLAGS) \
+@EEZE_CFLAGS@ \
@CHECK_CFLAGS@
-tests_eeze_eeze_suite_LDADD = $(EEZE_COMMON_USER_LDADD) @CHECK_LIBS@
-
+tests_eeze_eeze_suite_LDADD = @CHECK_LIBS@ @USE_EEZE_LIBS@
+tests_eeze_eeze_suite_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
endif
endif
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 3ca667bdf9..bcddfd4293 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -7,55 +7,13 @@ lib/efreet/libefreet_mime.la \
lib/efreet/libefreet_trash.la
EFREET_COMMON_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_builddir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
--I$(top_srcdir)/src/lib/efreet \
--I$(top_builddir)/src/lib/efreet \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DDATA_DIR=\"$(datadir)\" \
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
--DEFL_EFREET_BUILD \
-@EFL_COV_CFLAGS@ \
-@EFREET_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-EFREET_COMMON_LIBADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/ecore_file/libecore_file.la \
-lib/eet/libeet.la \
-lib/edbus/libedbus2.la \
-@USE_EVIL_LIBS@ \
-@EFREET_LIBS@ \
-@EFL_COV_LIBS@
-
-EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la
-
-EFREET_COMMON_USER_LDADD = \
-lib/efreet/libefreet.la \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/ecore_file/libecore_file.la \
-lib/eet/libeet.la \
-lib/edbus/libedbus2.la \
-@USE_EVIL_LIBS@ \
-@EFREET_LDFLAGS@ \
-@EFL_COV_LIBS@
+@EFREET_CFLAGS@
installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@
dist_installed_efreetmainheaders_DATA = \
@@ -88,19 +46,22 @@ lib/efreet/efreet_xml.h \
lib/efreet/efreet_cache_private.h
lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_la_LIBADD = $(EFREET_COMMON_LIBADD)
+lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@
+lib_efreet_libefreet_la_DEPENDENCIES = @EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# libefreet_mime.la
lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c
lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_mime_la_LIBADD = $(EFREET_COMMON_USER_LIBADD)
+lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_mime_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# libefreet_trash.la
lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c
lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-lib_efreet_libefreet_trash_la_LIBADD = $(EFREET_COMMON_USER_LIBADD)
+lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@
+lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -117,7 +78,8 @@ bin/efreet/efreetd_cache.h \
bin/efreet/efreetd_cache.c
bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreetd_LDADD = $(EFREET_COMMON_USER_LDADD)
+bin_efreet_efreetd_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH)
efreetinternal_bin_PROGRAMS = \
@@ -125,14 +87,14 @@ bin/efreet/efreet_desktop_cache_create \
bin/efreet/efreet_icon_cache_create
bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreet_desktop_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
-bin_efreet_efreet_desktop_cache_create_SOURCES = \
-bin/efreet/efreet_desktop_cache_create.c
+bin_efreet_efreet_desktop_cache_create_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-bin_efreet_efreet_icon_cache_create_LDADD = $(EFREET_COMMON_USER_LDADD)
-bin_efreet_efreet_icon_cache_create_SOURCES = \
-bin/efreet/efreet_icon_cache_create.c
+bin_efreet_efreet_icon_cache_create_LDADD = @USE_EFREET_LIBS@
+bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
### Unit tests
@@ -151,7 +113,10 @@ tests/efreet/compare/efreet_menu_alloc
# efreet_test
tests_efreet_efreet_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
tests_efreet_efreet_test_LDADD = \
-$(EFREET_COMMON_USER_LDADD) \
+@USE_EFREET_LIBS@ \
+lib/efreet/libefreet_mime.la
+tests_efreet_efreet_test_DEPENDENCIES = \
+@USE_EFREET_INTERNAL_LIBS@ \
lib/efreet/libefreet_mime.la
tests_efreet_efreet_test_SOURCES = \
@@ -168,38 +133,40 @@ tests/efreet/main.c
# efreet_spec_test
tests_efreet_efreet_spec_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_spec_test_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_spec_test_SOURCES = \
-tests/efreet/efreet_spec_test.c
+tests_efreet_efreet_spec_test_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_spec_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_spec_test_SOURCES = tests/efreet/efreet_spec_test.c
# efreet_cache_test
tests_efreet_efreet_cache_test_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_cache_test_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_cache_test_SOURCES = \
-tests/efreet/ef_cache.c
+tests_efreet_efreet_cache_test_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_cache_test_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_cache_test_SOURCES = tests/efreet/ef_cache.c
# efreet_icon_cache_dump
tests_efreet_efreet_icon_cache_dump_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_icon_cache_dump_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_icon_cache_dump_SOURCES = \
-tests/efreet/efreet_icon_cache_dump.c
+tests_efreet_efreet_icon_cache_dump_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_icon_cache_dump_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_icon_cache_dump_SOURCES = tests/efreet/efreet_icon_cache_dump.c
# efreet_user_dir
tests_efreet_efreet_user_dir_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_efreet_user_dir_LDADD = $(EFREET_COMMON_USER_LDADD)
-tests_efreet_efreet_user_dir_SOURCES = \
-tests/efreet/efreet_user_dir.c
+tests_efreet_efreet_user_dir_LDADD = @USE_EFREET_LIBS@
+tests_efreet_efreet_user_dir_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
+tests_efreet_efreet_user_dir_SOURCES = tests/efreet/efreet_user_dir.c
# efreet_alloc
tests_efreet_compare_efreet_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_compare_efreet_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
+tests_efreet_compare_efreet_alloc_LDADD = @USE_EFREET_LIBS@
+tests_efreet_compare_efreet_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
tests_efreet_compare_efreet_alloc_SOURCES = \
tests/efreet/compare/efreet_alloc.c \
tests/efreet/compare/comp.h
# efreet_menu_alloc
tests_efreet_compare_efreet_menu_alloc_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
-tests_efreet_compare_efreet_menu_alloc_LDADD = $(EFREET_COMMON_USER_LDADD)
+tests_efreet_compare_efreet_menu_alloc_LDADD = @USE_EFREET_LIBS@
+tests_efreet_compare_efreet_menu_alloc_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
tests_efreet_compare_efreet_menu_alloc_SOURCES = \
tests/efreet/compare/efreet_menu_alloc.c \
tests/efreet/compare/comp.h
@@ -230,7 +197,8 @@ tests/efreet/efreet_test_efreet.c \
tests/efreet/efreet_test_efreet_cache.c
tests_efreet_efreet_suite_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) @CHECK_CFLAGS@
-tests_efreet_efreet_suite_LDADD = $(EFREET_COMMON_USER_LDADD) @CHECK_LIBS@
+tests_efreet_efreet_suite_LDADD = @CHECK_LIBS@ @USE_EFREET_LIBS@
+tests_efreet_efreet_suite_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
endif
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 51c32cb689..80af55f93f 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -154,28 +154,19 @@ else
lib_eina_libeina_la_SOURCES += lib/eina/eina_file.c
endif
-EINA_MODULE_COMMON_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--DEFL_EINA_BUILD
-
EINA_MODULE_COMMON_CFLAGS = \
@EINA_CFLAGS@ \
@VALGRIND_CFLAGS@
-EINA_MODULE_COMMON_LIBADD = \
-lib/eina/libeina.la \
-@EINA_LIBS@
-
if EINA_STATIC_BUILD_CHAINED_POOL
lib_eina_libeina_la_SOURCES += modules/eina/mp/chained_pool/eina_chained_mempool.c
else
einampchainedpooldir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
einampchainedpool_LTLIBRARIES = modules/eina/mp/chained_pool/chained_pool_module.la
-modules_eina_mp_chained_pool_chained_pool_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
-modules_eina_mp_chained_pool_chained_pool_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
+modules_eina_mp_chained_pool_chained_pool_module_la_LIBADD = @USE_EINA_LIBS@
+modules_eina_mp_chained_pool_chained_pool_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
modules_eina_mp_chained_pool_chained_pool_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eina_mp_chained_pool_chained_pool_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_chained_pool_chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c
@@ -187,9 +178,9 @@ else
einamponebigdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
einamponebig_LTLIBRARIES = modules/eina/mp/one_big/one_big_module.la
-modules_eina_mp_one_big_one_big_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
-modules_eina_mp_one_big_one_big_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
+modules_eina_mp_one_big_one_big_module_la_LIBADD = @USE_EINA_LIBS@
+modules_eina_mp_one_big_one_big_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
modules_eina_mp_one_big_one_big_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eina_mp_one_big_one_big_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_one_big_one_big_module_la_SOURCES = modules/eina/mp/one_big/eina_one_big.c
@@ -201,31 +192,23 @@ else
einamppassthroughdir = $(libdir)/eina/modules/mp/pass_through/$(MODULE_ARCH)
einamppassthrough_LTLIBRARIES = modules/eina/mp/pass_through/pass_through_module.la
-modules_eina_mp_pass_through_pass_through_module_la_CPPFLAGS = $(EINA_MODULE_COMMON_CPPFLAGS)
modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
-modules_eina_mp_pass_through_pass_through_module_la_LIBADD = $(EINA_MODULE_COMMON_LIBADD)
+modules_eina_mp_pass_through_pass_through_module_la_LIBADD = @USE_EINA_LIBS@
+modules_eina_mp_pass_through_pass_through_module_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
modules_eina_mp_pass_through_pass_through_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_eina_mp_pass_through_pass_through_module_la_LIBTOOLFLAGS = --tag=disable-static
modules_eina_mp_pass_through_pass_through_module_la_SOURCES = modules/eina/mp/pass_through/eina_pass_through.c
endif
lib_eina_libeina_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
+@EINA_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
--DEFL_EINA_BUILD \
-@EFL_COV_CFLAGS@ \
-@EINA_CFLAGS@ \
-@VALGRIND_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-lib_eina_libeina_la_LIBADD = \
-@EINA_LIBS@ \
-@EFL_COV_LIBS@ \
-@USE_EVIL_LIBS@ \
-@DL_LIBS@
+@VALGRIND_CFLAGS@
+
+lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @DL_LIBS@
+lib_eina_libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@
lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Script
@@ -281,28 +264,16 @@ tests/eina/eina_test_barrier.c
# tests/eina/eina_test_model.c
tests_eina_eina_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
@CHECK_CFLAGS@ \
@EINA_CFLAGS@
-
-tests_eina_eina_suite_LDADD = \
-lib/eina/libeina.la \
-@CHECK_LIBS@ \
-@EINA_LDFLAGS@
+tests_eina_eina_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
+tests_eina_eina_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx
-
-tests_eina_cxx_compile_test_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
-@CHECK_CFLAGS@ \
-@EINA_CFLAGS@
-
-tests_eina_cxx_compile_test_LDADD = \
-lib/eina/libeina.la \
-@EINA_LDFLAGS@
+tests_eina_cxx_compile_test_CPPFLAGS = @EINA_CFLAGS@
+tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@
+tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
EXTRA_LTLIBRARIES = tests/eina/module_dummy.la
@@ -311,19 +282,12 @@ check-local: tests/eina/module_dummy.la
tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
tests_eina_module_dummy_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
@CHECK_CFLAGS@ \
-@EINA_CFLAGS@ \
--DEFL_EINA_BUILD
-
-tests_eina_module_dummy_la_LIBADD = \
-lib/eina/libeina.la \
-@EINA_LIBS@
-
+@EINA_CFLAGS@
+tests_eina_module_dummy_la_LIBADD = @USE_EINA_LIBS@
+tests_eina_module_dummy_la_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
tests_eina_module_dummy_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-
tests_eina_module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
endif
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index 40816e65e3..8d4738ad93 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -26,23 +26,7 @@ lib_eio_libeio_la_SOURCES += lib/eio/eio_monitor_win32.c
endif
endif
-lib_eio_libeio_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/eio \
--DEFL_EIO_BUILD \
-@EIO_CFLAGS@ \
-@EFL_COV_CFLAGS@
-
-lib_eio_libeio_la_LIBADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/eet/libeet.la \
-lib/ecore/libecore.la \
-@EIO_LIBS@ \
-@EFL_COV_LIBS@
-
+lib_eio_libeio_la_CPPFLAGS = @EIO_CFLAGS@
+lib_eio_libeio_la_LIBADD = @EIO_LIBS@
+lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@
lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 8d07096f30..47bc04b0ad 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -17,20 +17,12 @@ lib/embryo/embryo_time.c \
lib/embryo/embryo_private.h
lib_embryo_libembryo_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
--DEFL_EMBRYO_BUILD \
-@EMBRYO_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-lib_embryo_libembryo_la_LIBADD = \
-lib/eina/libeina.la \
-@EMBRYO_LIBS@ \
-@USE_EVIL_LIBS@
-
+@EMBRYO_CFLAGS@
+lib_embryo_libembryo_la_LIBADD = @EMBRYO_LIBS@
+lib_embryo_libembryo_la_DEPENDENCIES = @EMBRYO_INTERNAL_LIBS@
lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Binary
@@ -55,21 +47,14 @@ bin/embryo/embryo_cc_prefix.c \
bin/embryo/embryo_cc_prefix.h
bin_embryo_embryo_cc_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/embryo \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
-@EMBRYO_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@EMBRYO_CFLAGS@
-bin_embryo_embryo_cc_LDADD = \
-lib/embryo/libembryo.la \
-lib/eina/libeina.la \
-@EMBRYO_LDFLAGS@ \
-@USE_EVIL_LIBS@
+bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@
+bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
EXTRA_DIST += \
bin/embryo/embryo_cc_sc5.scp \
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 45a2dedad0..085f2b4e53 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -3,45 +3,6 @@
lib_LTLIBRARIES += \
lib/emotion/libemotion.la
-EMOTION_COMMON_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_x \
--I$(top_builddir)/src/lib/ecore_x \
--I$(top_srcdir)/src/lib/ecore_input \
--I$(top_builddir)/src/lib/ecore_input \
--I$(top_srcdir)/src/lib/ecore_evas \
--I$(top_builddir)/src/lib/ecore_evas \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
--I$(top_builddir)/src/lib/evas \
--I$(top_srcdir)/src/lib/eio \
--I$(top_builddir)/src/lib/eio \
--I$(top_srcdir)/src/lib/eeze \
--I$(top_builddir)/src/lib/eeze \
--I$(top_srcdir)/src/lib/emotion \
--I$(top_builddir)/src/lib/emotion \
-@EFL_COV_CFLAGS@ \
-@EMOTION_CFLAGS@
-
-EMOTION_COMMON_LDADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/eet/libeet.la \
-lib/evas/libevas.la \
-lib/eio/libeio.la \
-@EFL_COV_LIBS@
-
-if EMOTION_HAVE_V4L2
-EMOTION_COMMON_LDADD += lib/eeze/libeeze.la
-endif
-
installed_emotionmainheadersdir = $(includedir)/emotion-@VMAJ@
dist_installed_emotionmainheaders_DATA = lib/emotion/Emotion.h
@@ -54,20 +15,14 @@ lib/emotion/emotion_webcam.c \
lib/emotion/emotion_modules.c \
lib/emotion/emotion_main.c
-EMOTION_COMMON_LIBADD = $(EMOTION_COMMON_LDADD) @EMOTION_LIBS@
-EMOTION_COMMON_LDADD += @EMOTION_LDFLAGS@
-EMOTION_COMMON_USER_LIBADD = $(EMOTION_COMMON_LIBADD) lib/emotion/libemotion.la
-EMOTION_COMMON_USER_LDADD = $(EMOTION_COMMON_LDADD) lib/emotion/libemotion.la
-
lib_emotion_libemotion_la_CPPFLAGS = \
-$(EMOTION_COMMON_CPPFLAGS) \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
--DEFL_EMOTION_BUILD
-
-lib_emotion_libemotion_la_LIBADD = $(EMOTION_COMMON_LIBADD)
+@EMOTION_CFLAGS@
+lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
+lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@
lib_emotion_libemotion_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
## Modules
@@ -86,11 +41,12 @@ emotionmodulexinedir = $(libdir)/emotion/modules/xine/$(MODULE_ARCH)
emotionmodulexine_LTLIBRARIES = modules/emotion/xine/module.la
modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
modules_emotion_xine_module_la_CPPFLAGS = \
-$(EMOTION_COMMON_CPPFLAGS) \
+@EMOTION_CFLAGS@ \
@EMOTION_MODULE_XINE_CFLAGS@
modules_emotion_xine_module_la_LIBADD = \
-$(EMOTION_COMMON_USER_LIBADD) \
+@USE_EMOTION_LIBS@ \
@EMOTION_MODULE_XINE_LIBS@
+modules_emotion_xine_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
modules_emotion_xine_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_emotion_xine_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -107,28 +63,24 @@ modules/emotion/gstreamer/emotion_sink.c
if EMOTION_STATIC_BUILD_GSTREAMER
lib_emotion_libemotion_la_SOURCES += $(EMOTION_GSTREAMER_SOURCES)
-if HAVE_ECORE_X
-EMOTION_COMMON_LDADD += \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_x/libecore_x.la
-endif
else
if EMOTION_BUILD_GSTREAMER
emotionmodulegstreamerdir = $(libdir)/emotion/modules/gstreamer/$(MODULE_ARCH)
emotionmodulegstreamer_LTLIBRARIES = modules/emotion/gstreamer/module.la
modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
modules_emotion_gstreamer_module_la_CPPFLAGS = \
-$(EMOTION_COMMON_CPPFLAGS) \
+@EMOTION_CFLAGS@ \
@EMOTION_MODULE_GSTREAMER_CFLAGS@
modules_emotion_gstreamer_module_la_LIBADD = \
-$(EMOTION_COMMON_USER_LIBADD) \
+@USE_EMOTION_LIBS@ \
@EMOTION_MODULE_GSTREAMER_LIBS@
+modules_emotion_gstreamer_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
modules_emotion_gstreamer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_emotion_gstreamer_module_la_LIBTOOLFLAGS = --tag=disable-static
if HAVE_ECORE_X
-modules_emotion_gstreamer_module_la_LIBADD += \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_x/libecore_x.la
+modules_emotion_gstreamer_module_la_CPPFLAGS += @ECORE_X_CFLAGS@ @ECORE_EVAS_CFLAGS@
+modules_emotion_gstreamer_module_la_LIBADD += @USE_ECORE_X_LIBS@ @USE_ECORE_EVAS_LIBS@
+modules_emotion_gstreamer_module_la_DEPENDENCIES += @USE_ECORE_X_INTERNAL_LIBS@ @USE_ECORE_EVAS_INTERNAL_LIBS@
endif
endif
endif
@@ -146,12 +98,12 @@ emotionmodulegenericdir = $(libdir)/emotion/modules/generic/$(MODULE_ARCH)
emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la
modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
modules_emotion_generic_module_la_CPPFLAGS = \
-$(EMOTION_COMMON_CPPFLAGS) \
+@EMOTION_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
-modules_emotion_generic_module_la_LIBADD = \
-$(EMOTION_COMMON_USER_LIBADD)
+modules_emotion_generic_module_la_LIBADD = @USE_EMOTION_LIBS@
+modules_emotion_generic_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
modules_emotion_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_emotion_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -170,11 +122,15 @@ emotionedjeexternal_LTLIBRARIES = edje_external/emotion/module.la
edje_external_emotion_module_la_SOURCES = \
edje_external/emotion/emotion.c
edje_external_emotion_module_la_CPPFLAGS = \
-$(EMOTION_COMMON_CPPFLAGS) \
-$(EDJE_COMMON_CPPFLAGS)
+@EDJE_CFLAGS@ \
+@EMOTION_CFLAGS@ \
+-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
edje_external_emotion_module_la_LIBADD = \
-$(EMOTION_COMMON_USER_LIBADD) \
-$(EDJE_COMMON_USER_LIBADD)
+@USE_EDJE_LIBS@ \
+@USE_EMOTION_LIBS@
+edje_external_emotion_module_la_DEPENDENCIES = \
+@USE_EDJE_INTERNAL_LIBS@ \
+@USE_EMOTION_INTERNAL_LIBS@
edje_external_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
edje_external_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -190,18 +146,15 @@ tests_emotion_emotion_test_SOURCES = \
tests/emotion/emotion_test_main.c
tests_emotion_emotion_test_CPPFLAGS = \
-$(EMOTION_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/edje \
--I$(top_builddir)/src/lib/edje \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\"
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+@EDJE_CFLAGS@ \
+@EMOTION_CFLAGS@
-tests_emotion_emotion_test_LDADD = \
-$(EMOTION_COMMON_USER_LDADD) \
-lib/ecore_evas/libecore_evas.la \
-lib/edje/libedje.la
+tests_emotion_emotion_test_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@
+tests_emotion_emotion_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ @USE_EMOTION_INTERNAL_LIBS@
tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc
@$(MKDIR_P) tests/emotion/data
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 9c5795d47f..f2dd3c4eb1 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -11,17 +11,9 @@ lib/eo/eo.c \
lib/eo/eo_base_class.c \
lib/eo/eo_private.h
-lib_eo_libeo_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--DNDEBUG \
--DEFL_EO_BUILD \
-@EFL_COV_CFLAGS@ \
-@EO_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@
+lib_eo_libeo_la_CPPFLAGS = -DNDEBUG @EO_CFLAGS@
+lib_eo_libeo_la_LIBADD = @EO_LIBS@
+lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Unit tests
@@ -46,17 +38,9 @@ tests/eo/access/access_main.c \
tests/eo/access/access_simple.c \
tests/eo/access/access_simple.h \
tests/eo/access/access_simple_protected.h
-
-tests_eo_test_access_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-@CHECK_CFLAGS@ \
-@EO_CFLAGS@
-
-tests_eo_test_access_LDADD = \
-lib/eo/libeo.la \
-@EO_LDFLAGS@
+tests_eo_test_access_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_access_LDADD = @USE_EO_LIBS@
+tests_eo_test_access_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
tests_eo_test_composite_objects_SOURCES = \
tests/eo/composite_objects/composite_objects_comp.c \
@@ -64,17 +48,9 @@ tests/eo/composite_objects/composite_objects_comp.h \
tests/eo/composite_objects/composite_objects_main.c \
tests/eo/composite_objects/composite_objects_simple.c \
tests/eo/composite_objects/composite_objects_simple.h
-
-tests_eo_test_composite_objects_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-@CHECK_CFLAGS@ \
-@EO_CFLAGS@
-
-tests_eo_test_composite_objects_LDADD = \
-lib/eo/libeo.la \
-@EO_LDFLAGS@
+tests_eo_test_composite_objects_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_composite_objects_LDADD = @USE_EO_LIBS@
+tests_eo_test_composite_objects_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
tests_eo_test_constructors_SOURCES = \
tests/eo/constructors/constructors_main.c \
@@ -94,17 +70,9 @@ tests/eo/constructors/constructors_simple6.c \
tests/eo/constructors/constructors_simple6.h \
tests/eo/constructors/constructors_simple7.c \
tests/eo/constructors/constructors_simple7.h
-
-tests_eo_test_constructors_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-@CHECK_CFLAGS@ \
-@EO_CFLAGS@
-
-tests_eo_test_constructors_LDADD = \
-lib/eo/libeo.la \
-@EO_LDFLAGS@
+tests_eo_test_constructors_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_constructors_LDADD = @USE_EO_LIBS@
+tests_eo_test_constructors_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
if EFL_ENABLE_TESTS
@@ -116,19 +84,13 @@ tests/eo/suite/eo_suite.h \
tests/eo/suite/eo_test_class_errors.c \
tests/eo/suite/eo_test_general.c \
tests/eo/suite/eo_test_init.c
-
tests_eo_eo_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-DNDEBUG \
@CHECK_CFLAGS@ \
@EO_CFLAGS@
-tests_eo_eo_suite_LDADD = \
-lib/eo/libeo.la \
-@CHECK_LIBS@ \
-@EO_LDFLAGS@
+tests_eo_eo_suite_LDADD = @CHECK_LIBS@ @USE_EO_LIBS@
+tests_eo_eo_suite_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
endif
@@ -142,17 +104,9 @@ tests/eo/function_overrides/function_overrides_inherit3.h \
tests/eo/function_overrides/function_overrides_main.c \
tests/eo/function_overrides/function_overrides_simple.c \
tests/eo/function_overrides/function_overrides_simple.h
-
-tests_eo_test_function_overrides_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-@CHECK_CFLAGS@ \
-@EO_CFLAGS@
-
-tests_eo_test_function_overrides_LDADD = \
-lib/eo/libeo.la \
-@EO_LDFLAGS@
+tests_eo_test_function_overrides_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@
+tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
tests_eo_test_interface_SOURCES = \
tests/eo/interface/interface_interface.c \
@@ -162,17 +116,9 @@ tests/eo/interface/interface_interface2.h \
tests/eo/interface/interface_main.c \
tests/eo/interface/interface_simple.c \
tests/eo/interface/interface_simple.h
-
-tests_eo_test_interface_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-@CHECK_CFLAGS@ \
-@EO_CFLAGS@
-
-tests_eo_test_interface_LDADD = \
-lib/eo/libeo.la \
-@EO_LDFLAGS@
+tests_eo_test_interface_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_interface_LDADD = @USE_EO_LIBS@
+tests_eo_test_interface_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
tests_eo_test_mixin_SOURCES = \
tests/eo/mixin/mixin_inherit.c \
@@ -188,32 +134,16 @@ tests/eo/mixin/mixin_mixin4.c \
tests/eo/mixin/mixin_mixin4.h \
tests/eo/mixin/mixin_simple.c \
tests/eo/mixin/mixin_simple.h
-
-tests_eo_test_mixin_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-@CHECK_CFLAGS@ \
-@EO_CFLAGS@
-
-tests_eo_test_mixin_LDADD = \
-lib/eo/libeo.la \
-@EO_LDFLAGS@
+tests_eo_test_mixin_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_mixin_LDADD = @USE_EO_LIBS@
+tests_eo_test_mixin_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
tests_eo_test_signals_SOURCES = \
tests/eo/signals/signals_main.c \
tests/eo/signals/signals_simple.c \
tests/eo/signals/signals_simple.h
-
-tests_eo_test_signals_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
-@CHECK_CFLAGS@ \
-@EO_CFLAGS@
-
-tests_eo_test_signals_LDADD = \
-lib/eo/libeo.la \
-@EO_LDFLAGS@
+tests_eo_test_signals_CPPFLAGS = @EO_CFLAGS@
+tests_eo_test_signals_LDADD = @USE_EO_LIBS@
+tests_eo_test_signals_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
EXTRA_DIST += tests/eo/eunit_tests.h
diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am
index e3934a2ab8..c9399c9c2e 100644
--- a/src/Makefile_Escape.am
+++ b/src/Makefile_Escape.am
@@ -19,9 +19,9 @@ lib/escape/escape_libgen.c \
lib/escape/escape_mman.c \
lib/escape/escape_unistd.c
-lib_escape_libescape_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/escape
+lib_escape_libescape_la_CPPFLAGS = @ESCAPE_CFLAGS@
lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@
+lib_escape_libescape_la_DEPENDENCIES = @ESCAPE_INTERNAL_LIBS@
lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
endif
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 3b0e15daae..b7a8552fa6 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -4,38 +4,6 @@ lib_LTLIBRARIES += \
lib/ethumb/libethumb.la \
lib/ethumb/client/libethumb_client.la
-ETHUMB_COMMON_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eo \
--I$(top_srcdir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_evas \
--I$(top_builddir)/src/lib/ecore_evas \
--I$(top_srcdir)/src/lib/ecore_file \
--I$(top_builddir)/src/lib/ecore_file \
--I$(top_srcdir)/src/lib/evas \
--I$(top_builddir)/src/lib/evas \
--I$(top_srcdir)/src/lib/edje \
--I$(top_builddir)/src/lib/edje \
--I$(top_srcdir)/src/lib/ethumb \
--I$(top_builddir)/src/lib/ethumb \
-@EFL_COV_CFLAGS@ \
-@ETHUMB_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-
-ETHUMB_COMMON_LDADD = \
-lib/eina/libeina.la \
-lib/eo/libeo.la \
-lib/ecore/libecore.la \
-lib/ecore_evas/libecore_evas.la \
-lib/ecore_file/libecore_file.la \
-lib/evas/libevas.la \
-lib/edje/libedje.la \
-@EFL_COV_LIBS@ \
-@USE_EVIL_LIBS@
-
installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@
dist_installed_ethumbmainheaders_DATA = \
lib/ethumb/Ethumb.h \
@@ -49,38 +17,22 @@ lib/ethumb/md5.h \
lib/ethumb/ethumb.c \
lib/ethumb/md5.c
-ETHUMB_COMMON_LIBADD = $(ETHUMB_COMMON_LDADD) @ETHUMB_LIBS@
-ETHUMB_COMMON_LDADD += @ETHUMB_LDFLAGS@
-ETHUMB_COMMON_USER_LIBADD = $(ETHUMB_COMMON_LIBADD) lib/ethumb/libethumb.la
-ETHUMB_COMMON_USER_LDADD = $(ETHUMB_COMMON_LDADD) lib/ethumb/libethumb.la
-
lib_ethumb_libethumb_la_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
--DEFL_ETHUMB_BUILD
-
-lib_ethumb_libethumb_la_LIBADD = $(ETHUMB_COMMON_LIBADD)
+@ETHUMB_CFLAGS@
+lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
+lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-
+# TODO: fix directory!
# libethumb_client.la
-lib_ethumb_client_libethumb_client_la_SOURCES = \
-lib/ethumb/client/ethumb_client.c
-
-lib_ethumb_client_libethumb_client_la_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
--I$(top_srcdir)/src/lib/ethumb/client \
--I$(top_builddir)/src/lib/ethumb/client \
--DEFL_ETHUMB_BUILD
-
-lib_ethumb_client_libethumb_client_la_LIBADD = \
-$(ETHUMB_COMMON_USER_LIBADD) \
-lib/edbus/libedbus2.la
+lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb/client/ethumb_client.c
+lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
+lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
+lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
## Modules
@@ -91,21 +43,18 @@ ethumbmoduleemotion_LTLIBRARIES = modules/ethumb/emotion/module.la
modules_ethumb_emotion_module_la_SOURCES = \
modules/ethumb/emotion/emotion.c
modules_ethumb_emotion_module_la_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/eet \
--I$(top_builddir)/src/lib/eet \
--I$(top_srcdir)/src/lib/emotion \
--I$(top_builddir)/src/lib/emotion \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\"
-
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+@EMOTION_CFLAGS@ \
+@ETHUMB_CFLAGS@
modules_ethumb_emotion_module_la_LIBADD = \
-$(ETHUMB_COMMON_USER_LIBADD) \
-lib/eet/libeet.la \
-lib/emotion/libemotion.la
-
+@USE_EMOTION_LIBS@ \
+@USE_ETHUMB_LIBS@
+modules_ethumb_emotion_module_la_DEPENDENCIES = \
+@USE_EMOTION_INTERNAL_LIBS@ \
+@USE_ETHUMB_INTERNAL_LIBS@
modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -132,40 +81,33 @@ ethumbinternal_bin_PROGRAMS = \
bin/ethumb/ethumbd_slave
bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
-bin_ethumb_ethumb_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS)
-bin_ethumb_ethumb_LDADD = $(ETHUMB_COMMON_USER_LDADD)
+bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
+bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
+bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
# TODO: review why ethumd (master) links to libethumb! shouldn't
bin_ethumb_ethumbd_SOURCES = \
bin/ethumb/ethumbd_private.h \
bin/ethumb/ethumbd.c
bin_ethumb_ethumbd_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\"
-bin_ethumb_ethumbd_LDADD = \
-$(ETHUMB_COMMON_USER_LDADD) \
-lib/edbus/libedbus2.la
-
-bin_ethumb_ethumbd_client_SOURCES = \
-bin/ethumb/ethumbd_client.c
-bin_ethumb_ethumbd_client_CPPFLAGS = \
-$(ETHUMB_COMMON_CPPFLAGS) \
--I$(top_srcdir)/src/lib/edbus \
--I$(top_builddir)/src/lib/edbus \
--I$(top_srcdir)/src/lib/ethumb/client \
--I$(top_builddir)/src/lib/ethumb/client
-bin_ethumb_ethumbd_client_LDADD = \
-$(ETHUMB_COMMON_USER_LDADD) \
-lib/ethumb/client/libethumb_client.la \
-lib/edbus/libedbus2.la
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+@ETHUMB_CLIENT_CFLAGS@
+bin_ethumb_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
+bin_ethumb_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
+bin_ethumb_ethumbd_client_SOURCES = bin/ethumb/ethumbd_client.c
+bin_ethumb_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
+bin_ethumb_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
+bin_ethumb_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
+
+# slave does not use dbus, it's a simple ethumb application
bin_ethumb_ethumbd_slave_SOURCES = \
bin/ethumb/ethumbd_private.h \
bin/ethumb/ethumbd_slave.c
-bin_ethumb_ethumbd_slave_CPPFLAGS = $(ETHUMB_COMMON_CPPFLAGS)
-bin_ethumb_ethumbd_slave_LDADD = $(ETHUMB_COMMON_USER_LDADD)
+bin_ethumb_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
+bin_ethumb_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
+bin_ethumb_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
+
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index ac6ba0924b..a180b93128 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -190,26 +190,18 @@ lib/evas/common/evas_text_utils.h \
lib/evas/common/evas_font_ot.h
lib_evas_libevas_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evas \
--I$(top_srcdir)/src/lib/evas/include \
+-I$(top_srcdir)/src/lib/evas/common \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/lib/evas/file \
+-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/static_libs/libunibreak \
--I$(top_srcdir)/src/lib/evas/common \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--DEFL_EVAS_BUILD \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-@EFL_COV_CFLAGS@ \
@EVAS_CFLAGS@ \
@VALGRIND_CFLAGS@ \
-@ALTIVEC_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@ALTIVEC_CFLAGS@
# SSE3
noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
@@ -219,20 +211,19 @@ lib/evas/common/evas_op_blend/op_blend_master_sse3.c
lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = \
$(lib_evas_libevas_la_CPPFLAGS) \
-@EFL_COV_CFLAGS@ \
@SSE3_CFLAGS@
-lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@
+lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EVAS_LIBS@
+lib_evas_common_libevas_op_blend_sse3_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
lib_evas_libevas_la_CXXFLAGS =
lib_evas_libevas_la_LIBADD = \
lib/evas/common/libevas_op_blend_sse3.la \
-lib/eina/libeina.la \
-lib/eet/libeet.la \
-lib/eo/libeo.la \
-@EVAS_LIBS@ \
-@EFL_COV_LIBS@
+@EVAS_LIBS@
+lib_evas_libevas_la_DEPENDENCIES = \
+lib/evas/common/libevas_op_blend_sse3.la \
+@EVAS_INTERNAL_LIBS@
lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -369,15 +360,11 @@ enginesoftwaregenericpkgdir = $(libdir)/evas/modules/engines/software_generic/$(
enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/module.la
modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c
modules_evas_engines_software_generic_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
--DEFL_EVAS_BUILD \
@EVAS_CFLAGS@
-modules_evas_engines_software_generic_module_la_LIBADD = lib/evas/libevas.la
+modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
+modules_evas_engines_software_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_software_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_software_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -395,16 +382,11 @@ enginebufferpkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la
modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
modules_evas_engines_buffer_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
--DEFL_EVAS_BUILD \
-@EVAS_CFLAGS@ \
-@USE_EVIL_CFLAGS@
-modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la
+@EVAS_CFLAGS@
+modules_evas_engines_buffer_module_la_LIBADD = @USE_EVAS_LIBS@
+modules_evas_engines_buffer_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_buffer_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -427,17 +409,14 @@ enginefbpkgdir = $(libdir)/evas/modules/engines/fb/$(MODULE_ARCH)
enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la
modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES)
modules_evas_engines_fb_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@evas_engine_fb_cflags@ \
@EVAS_CFLAGS@
modules_evas_engines_fb_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_fb_libs@
+modules_evas_engines_fb_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_fb_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_fb_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -544,21 +523,14 @@ else
noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES)
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
--DEFL_EVAS_BUILD \
@EVAS_CFLAGS@
if BUILD_ENGINE_GL_X11
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ @evas_engine_gl_xcb_cflags@
endif
-modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
-lib/eet/libeet.la \
-lib/evas/libevas.la
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = @USE_EVAS_LIBS@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_gl_common_libevas_engine_gl_common_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -575,32 +547,26 @@ lib_evas_libevas_la_SOURCES += $(GL_COCOA_SOURCES)
lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_cocoa_cflags@
-lib_evas_libevas_la_LIBADD += \
-@evas_engine_gl_cocoa_libs@
+lib_evas_libevas_la_LIBADD += @evas_engine_gl_cocoa_libs@
else
engineglcocoapkgdir = $(libdir)/evas/modules/engines/gl_cocoa/$(MODULE_ARCH)
engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la
modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES)
modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
-@evas_engine_gl_cocoa_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_engine_gl_cocoa_cflags@
modules_evas_engines_gl_cocoa_module_la_LIBADD =
if ! EVAS_STATIC_BUILD_GL_COMMON
modules_evas_engines_gl_cocoa_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_cocoa_module_la_LIBADD += \
-lib/eet/libeet.la \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_gl_cocoa_libs@
+modules_evas_engines_gl_cocoa_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_gl_cocoa_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_cocoa_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -616,31 +582,28 @@ lib_evas_libevas_la_SOURCES += $(GL_SDL_SOURCES)
lib_evas_libevas_la_CPPFLAGS += \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
@evas_engine_gl_sdl_cflags@
-lib_evas_libevas_la_LIBADD += \
-@evas_engine_gl_sdl_libs@
+lib_evas_libevas_la_LIBADD += @evas_engine_gl_sdl_libs@
else
engineglsdlpkgdir = $(libdir)/evas/modules/engines/gl_sdl/$(MODULE_ARCH)
engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la
modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
-@evas_engine_gl_sdl_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_engine_gl_sdl_cflags@
modules_evas_engines_gl_sdl_module_la_LIBADD =
if ! EVAS_STATIC_BUILD_GL_COMMON
modules_evas_engines_gl_sdl_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_sdl_module_la_LIBADD += \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_gl_sdl_libs@
+modules_evas_engines_gl_sdl_module_la_DEPENDENCIES = \
+@USE_EVAS_INTERNAL_LIBS@ \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_gl_sdl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_sdl_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -664,27 +627,24 @@ engineglx11pkgdir = $(libdir)/evas/modules/engines/gl_x11/$(MODULE_ARCH)
engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la
modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
modules_evas_engines_gl_x11_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+@EVAS_CFLAGS@ \
@evas_engine_gl_xlib_cflags@ \
-@evas_engine_gl_xcb_cflags@ \
-@EVAS_CFLAGS@
+@evas_engine_gl_xcb_cflags@
modules_evas_engines_gl_x11_module_la_LIBADD =
if ! EVAS_STATIC_BUILD_GL_COMMON
modules_evas_engines_gl_x11_module_la_LIBADD += \
modules/evas/engines/gl_common/libevas_engine_gl_common.la
endif
modules_evas_engines_gl_x11_module_la_LIBADD += \
-lib/eet/libeet.la \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_gl_xlib_libs@ \
@evas_engine_gl_xcb_libs@
+modules_evas_engines_gl_x11_module_la_DEPENDENCIES = \
+@USE_EVAS_INTERNAL_LIBS@ \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_gl_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -706,17 +666,14 @@ enginepsl1ghtpkgdir = $(libdir)/evas/modules/engines/psl1ght/$(MODULE_ARCH)
enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la
modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES)
modules_evas_engines_psl1ght_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-@evas_engine_psl1ght_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_engine_psl1ght_cflags@
modules_evas_engines_psl1ght_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_psl1ght_libs@
+modules_evas_engines_psl1ght_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_psl1ght_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_psl1ght_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -740,20 +697,15 @@ enginesoftwareddrawpkgdir = $(libdir)/evas/modules/engines/software_ddraw/$(MODU
enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module.la
modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
--DEFL_EVAS_BUILD \
-@evas_engine_software_ddraw_cflags@ \
@EVAS_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@evas_engine_software_ddraw_cflags@
modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
modules_evas_engines_software_ddraw_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_software_ddraw_libs@
+modules_evas_engines_software_ddraw_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_software_ddraw_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_software_ddraw_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -776,19 +728,14 @@ enginesoftwaregdipkgdir = $(libdir)/evas/modules/engines/software_gdi/$(MODULE_A
enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la
modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
--DEFL_EVAS_BUILD \
-@evas_engine_software_gdi_cflags@ \
@EVAS_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@evas_engine_software_gdi_cflags@
modules_evas_engines_software_gdi_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_software_gdi_libs@
+modules_evas_engines_software_gdi_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_software_gdi_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_software_gdi_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -802,10 +749,6 @@ modules/evas/engines/software_x11/evas_engine.h \
modules/evas/engines/software_x11/evas_x_egl.c \
modules/evas/engines/software_x11/evas_x_egl.h
SOFTWARE_X11_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
@@ -849,7 +792,8 @@ enginesoftwarex11pkgdir = $(libdir)/evas/modules/engines/software_x11/$(MODULE_A
enginesoftwarex11pkg_LTLIBRARIES = modules/evas/engines/software_x11/module.la
modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
modules_evas_engines_software_x11_module_la_CPPFLAGS = $(SOFTWARE_X11_CPPFLAGS)
-modules_evas_engines_software_x11_module_la_LIBADD = lib/evas/libevas.la $(SOFTWARE_X11_LIBADD)
+modules_evas_engines_software_x11_module_la_LIBADD = @USE_EVAS_LIBS@ $(SOFTWARE_X11_LIBADD)
+modules_evas_engines_software_x11_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -872,21 +816,18 @@ enginewaylandeglpkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARC
enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la
modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES)
modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
-@evas_engine_wayland_egl_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_engine_wayland_egl_cflags@
modules_evas_engines_wayland_egl_module_la_LIBADD = \
+@USE_EVAS_LIBS@ \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
-lib/eet/libeet.la \
-lib/evas/libevas.la \
@evas_engine_wayland_egl_libs@
+modules_evas_engines_wayland_egl_module_la_DEPENDENCIES = \
+@USE_EVAS_INTERNAL_LIBS@ \
+modules/evas/engines/gl_common/libevas_engine_gl_common.la
modules_evas_engines_wayland_egl_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_wayland_egl_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -907,17 +848,14 @@ enginewaylandshmpkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARC
enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la
modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-@evas_engine_wayland_shm_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_engine_wayland_shm_cflags@
modules_evas_engines_wayland_shm_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_engine_wayland_shm_libs@
+modules_evas_engines_wayland_shm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_wayland_shm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_wayland_shm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -935,17 +873,13 @@ loaderbmppkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH)
loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la
modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c
modules_evas_loaders_bmp_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_bmp_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_bmp_cflags@
modules_evas_loaders_bmp_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_bmp_libs@
+modules_evas_loaders_bmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -961,19 +895,13 @@ loadereetpkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH)
loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la
modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c
modules_evas_loaders_eet_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_eet_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_eet_cflags@
modules_evas_loaders_eet_module_la_LIBADD = \
-lib/evas/libevas.la \
-lib/evas/libeet.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_eet_libs@
+modules_evas_loaders_eet_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -989,17 +917,13 @@ loadergenericpkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH)
loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la
modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c
modules_evas_loaders_generic_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_generic_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_generic_cflags@
modules_evas_loaders_generic_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_generic_libs@
+modules_evas_loaders_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1015,17 +939,13 @@ loadergifpkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH)
loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la
modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c
modules_evas_loaders_gif_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_gif_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_gif_cflags@
modules_evas_loaders_gif_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_gif_libs@
+modules_evas_loaders_gif_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_gif_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_gif_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1041,17 +961,13 @@ loadericopkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH)
loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la
modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c
modules_evas_loaders_ico_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_ico_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_ico_cflags@
modules_evas_loaders_ico_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_ico_libs@
+modules_evas_loaders_ico_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1070,17 +986,13 @@ loaderjpegpkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH)
loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la
modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c
modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_jpeg_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_jpeg_cflags@
modules_evas_loaders_jpeg_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_jpeg_libs@
+modules_evas_loaders_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
if BUILD_SAVER_JPEG
@@ -1088,16 +1000,13 @@ saverjpegpkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH)
saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la
modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c
modules_evas_savers_jpeg_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-@evas_image_loader_jpeg_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_jpeg_cflags@
modules_evas_savers_jpeg_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_jpeg_libs@
+modules_evas_savers_jpeg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_savers_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_savers_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1114,17 +1023,13 @@ loaderpmapspkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH)
loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la
modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c
modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_pmaps_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_pmaps_cflags@
modules_evas_loaders_pmaps_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_pmaps_libs@
+modules_evas_loaders_pmaps_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1140,17 +1045,13 @@ loaderpngpkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH)
loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la
modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c
modules_evas_loaders_png_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_png_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_png_cflags@
modules_evas_loaders_png_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_png_libs@
+modules_evas_loaders_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1158,17 +1059,13 @@ saverpngpkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH)
saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la
modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c
modules_evas_savers_png_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_png_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_png_cflags@
modules_evas_savers_png_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_png_libs@
+modules_evas_savers_png_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_savers_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_savers_png_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1184,17 +1081,13 @@ loaderpsdpkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH)
loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la
modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c
modules_evas_loaders_psd_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_psd_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_psd_cflags@
modules_evas_loaders_psd_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_psd_libs@
+modules_evas_loaders_psd_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1210,17 +1103,13 @@ loadersvgpkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la
modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c
modules_evas_loaders_svg_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_svg_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_svg_cflags@
modules_evas_loaders_svg_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_svg_libs@
+modules_evas_loaders_svg_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_svg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_svg_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1236,17 +1125,13 @@ loadertgapkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH)
loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la
modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c
modules_evas_loaders_tga_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_tga_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_tga_cflags@
modules_evas_loaders_tga_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_tga_libs@
+modules_evas_loaders_tga_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1262,18 +1147,13 @@ loadertiffpkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH)
loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la
modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c
modules_evas_loaders_tiff_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_tiff_cflags@ \
@EVAS_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@evas_image_loader_tiff_cflags@
modules_evas_loaders_tiff_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_tiff_libs@
+modules_evas_loaders_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -1281,18 +1161,13 @@ savertiffpkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH)
savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la
modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c
modules_evas_savers_tiff_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_tiff_cflags@ \
@EVAS_CFLAGS@ \
-@USE_EVIL_CFLAGS@
+@evas_image_loader_tiff_cflags@
modules_evas_savers_tiff_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_tiff_libs@
+modules_evas_savers_tiff_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_savers_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_savers_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1308,17 +1183,13 @@ loaderwbmppkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH)
loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la
modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c
modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_wbmp_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_wbmp_cflags@
modules_evas_loaders_wbmp_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_wbmp_libs@
+modules_evas_loaders_wbmp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1334,17 +1205,13 @@ loaderwebppkgdir = $(libdir)/evas/modules/loaders/webp/$(MODULE_ARCH)
loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la
modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c
modules_evas_loaders_webp_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_webp_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_webp_cflags@
modules_evas_loaders_webp_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_webp_libs@
+modules_evas_loaders_webp_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1360,17 +1227,13 @@ loaderxpmpkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH)
loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la
modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c
modules_evas_loaders_xpm_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
--DEFL_EVAS_BUILD \
-@evas_image_loader_xpm_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_xpm_cflags@
modules_evas_loaders_xpm_module_la_LIBADD = \
-lib/evas/libevas.la \
+@USE_EVAS_LIBS@ \
@evas_image_loader_xpm_libs@
+modules_evas_loaders_xpm_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
modules_evas_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1409,32 +1272,20 @@ lib/evas/cserve2/evas_cs2_utils.h \
lib/evas/cserve2/evas_cs2_utils.c
bin_evas_evas_cserve2_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
--I$(top_srcdir)/src/lib/eet \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
@EVAS_CFLAGS@
-bin_evas_evas_cserve2_LDADD = \
-@EVAS_LDFLAGS@ \
-lib/eet/libeet.la \
-lib/eina/libeina.la \
-lib/evas/libevas.la
+bin_evas_evas_cserve2_LDADD = @USE_EVAS_LIBS@
+bin_evas_evas_cserve2_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
bin_evas_evas_cserve2_client_SOURCES = \
bin/evas/evas_cserve2_client.c
bin_evas_evas_cserve2_client_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
@@ -1443,43 +1294,29 @@ bin_evas_evas_cserve2_usage_SOURCES = \
bin/evas/evas_cserve2_usage.c
bin_evas_evas_cserve2_usage_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
-bin_evas_evas_cserve2_usage_LDADD = \
-lib/eina/libeina.la \
-@EVAS_LDFLAGS@
+bin_evas_evas_cserve2_usage_LDADD = @USE_EINA_LIBS@
+bin_evas_evas_cserve2_usage_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
bin_evas_evas_cserve2_debug_SOURCES = \
bin/evas/evas_cserve2_debug.c
bin_evas_evas_cserve2_debug_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
-bin_evas_evas_cserve2_debug_LDADD = \
-lib/eina/libeina.la \
-@EVAS_LDFLAGS@
+bin_evas_evas_cserve2_debug_LDADD = @USE_EINA_LIBS@
+bin_evas_evas_cserve2_debug_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
bin_evas_evas_cserve2_slave_SOURCES = \
bin/evas/evas_cserve2_slave.c \
bin/evas/evas_cserve2_utils.c
bin_evas_evas_cserve2_slave_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -1487,21 +1324,14 @@ bin_evas_evas_cserve2_slave_CPPFLAGS = \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
@EVAS_CFLAGS@
-bin_evas_evas_cserve2_slave_LDADD = \
-lib/eina/libeina.la \
-@EVAS_LDFLAGS@ \
-@EVAS_CSERVE2_SLAVE_LIBS@
-
+bin_evas_evas_cserve2_slave_LDADD = @EVAS_CSERVE2_SLAVE_LIBS@ @USE_EINA_LIBS@
+bin_evas_evas_cserve2_slave_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
bin_evas_evas_cserve2_slave_LDFLAGS = -export-dynamic
bin_evas_dummy_slave_SOURCES = \
bin/evas/dummy_slave.c
bin_evas_dummy_slave_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
@EVAS_CFLAGS@
@@ -1517,16 +1347,13 @@ cserve2bmppkgdir = $(libdir)/evas/cserve2/loaders/bmp/$(MODULE_ARCH)
cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la
bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c
bin_evas_loaders_bmp_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
@EVAS_CFLAGS@
bin_evas_loaders_bmp_module_la_LIBADD = @EVAS_LIBS@
+bin_evas_loaders_bmp_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_bmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_bmp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1536,19 +1363,18 @@ cserve2eetpkgdir = $(libdir)/evas/cserve2/loaders/eet/$(MODULE_ARCH)
cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la
bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c
bin_evas_loaders_eet_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/eet \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_eet_cflags@ \
-@EVAS_CFLAGS@
-bin_evas_loaders_eet_module_la_LIBADD = @EVAS_LIBS@ \
-@evas_image_loader_eet_libs@ \
-lib/eet/libeet.la
+@EVAS_CFLAGS@ \
+@evas_image_loader_eet_cflags@
+bin_evas_loaders_eet_module_la_LIBADD = \
+@EVAS_LIBS@ \
+@USE_EET_LIBS@
+@evas_image_loader_eet_libs@
+bin_evas_loaders_eet_module_la_DEPENDENCIES = \
+@EVAS_INTERNAL_LIBS@ \
+@USE_EET_INTERNAL_LIBS@
bin_evas_loaders_eet_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_eet_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1558,16 +1384,13 @@ cserve2icopkgdir = $(libdir)/evas/cserve2/loaders/ico/$(MODULE_ARCH)
cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la
bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c
bin_evas_loaders_ico_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_ico_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_ico_cflags@
bin_evas_loaders_ico_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_ico_libs@
+bin_evas_loaders_ico_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_ico_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_ico_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1577,16 +1400,13 @@ cserve2jpegpkgdir = $(libdir)/evas/cserve2/loaders/jpeg/$(MODULE_ARCH)
cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la
bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c
bin_evas_loaders_jpeg_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_jpeg_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_jpeg_cflags@
bin_evas_loaders_jpeg_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_jpeg_libs@
+bin_evas_loaders_jpeg_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_jpeg_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_jpeg_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1596,16 +1416,13 @@ cserve2pmapspkgdir = $(libdir)/evas/cserve2/loaders/pmaps/$(MODULE_ARCH)
cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la
bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c
bin_evas_loaders_pmaps_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
+-I$(top_srcdir)/src/bin/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
--I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_pmaps_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_pmaps_cflags@
bin_evas_loaders_pmaps_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_pmaps_libs@
+bin_evas_loaders_pmaps_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_pmaps_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_pmaps_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1615,16 +1432,13 @@ cserve2pngpkgdir = $(libdir)/evas/cserve2/loaders/png/$(MODULE_ARCH)
cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la
bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c
bin_evas_loaders_png_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_png_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_png_cflags@
bin_evas_loaders_png_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_png_libs@
+bin_evas_loaders_png_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_png_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_png_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1634,16 +1448,13 @@ cserve2psdpkgdir = $(libdir)/evas/cserve2/loaders/psd/$(MODULE_ARCH)
cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la
bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c
bin_evas_loaders_psd_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_psd_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_psd_cflags@
bin_evas_loaders_psd_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_psd_libs@
+bin_evas_loaders_psd_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_psd_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_psd_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1653,16 +1464,13 @@ cserve2tgapkgdir = $(libdir)/evas/cserve2/loaders/tga/$(MODULE_ARCH)
cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la
bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c
bin_evas_loaders_tga_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_tga_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_tga_cflags@
bin_evas_loaders_tga_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tga_libs@
+bin_evas_loaders_tga_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_tga_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_tga_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1672,16 +1480,13 @@ cserve2tiffpkgdir = $(libdir)/evas/cserve2/loaders/tiff/$(MODULE_ARCH)
cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la
bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c
bin_evas_loaders_tiff_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_tiff_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_tiff_cflags@
bin_evas_loaders_tiff_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_tiff_libs@
+bin_evas_loaders_tiff_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_tiff_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_tiff_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1691,16 +1496,13 @@ cserve2wbmppkgdir = $(libdir)/evas/cserve2/loaders/wbmp/$(MODULE_ARCH)
cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la
bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c
bin_evas_loaders_wbmp_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_wbmp_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_wbmp_cflags@
bin_evas_loaders_wbmp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_wbmp_libs@
+bin_evas_loaders_wbmp_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_wbmp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_wbmp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1710,16 +1512,13 @@ cserve2webppkgdir = $(libdir)/evas/cserve2/loaders/webp/$(MODULE_ARCH)
cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la
bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c
bin_evas_loaders_webp_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_webp_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_webp_cflags@
bin_evas_loaders_webp_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_webp_libs@
+bin_evas_loaders_webp_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_webp_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_webp_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1729,16 +1528,13 @@ cserve2xpmpkgdir = $(libdir)/evas/cserve2/loaders/xpm/$(MODULE_ARCH)
cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la
bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c
bin_evas_loaders_xpm_module_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/lib/evas/cserve2 \
-I$(top_srcdir)/src/bin/evas \
-@evas_image_loader_xpm_cflags@ \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@evas_image_loader_xpm_cflags@
bin_evas_loaders_xpm_module_la_LIBADD = @EVAS_LIBS@ @evas_image_loader_xpm_libs@
+bin_evas_loaders_xpm_module_la_DEPENDENCIES = @EVAS_INTERNAL_LIBS@
bin_evas_loaders_xpm_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@@ -1762,17 +1558,9 @@ tests/evas/evas_tests_helpers.h \
tests/evas/evas_suite.h
tests_evas_evas_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/eina \
--I$(top_builddir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_srcdir)/src/lib/evas \
@CHECK_CFLAGS@ \
@EVAS_CFLAGS@
-tests_evas_evas_suite_LDADD = \
-lib/evas/libevas.la \
-lib/eina/libeina.la \
-@CHECK_LIBS@ \
-@EVAS_LDFLAGS@
-
+tests_evas_evas_suite_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@
+tests_evas_evas_suite_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
endif
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 6f7184ffc7..c60edcfa23 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -95,12 +95,10 @@ else
lib_evil_libevil_la_SOURCES += lib/evil/evil_link_xp.cpp
endif
-lib_evil_libevil_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
-@EVIL_CPPFLAGS@
lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@
lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@
lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
+lib_evil_libevil_la_DEPENDENCIES = @EVIL_INTERNAL_LIBS@
lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if HAVE_WINCE
@@ -112,12 +110,12 @@ endif
lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
lib_evil_libdl_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
+@EVIL_CFLAGS@ \
@EVIL_DLFCN_CPPFLAGS@
-
-lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
-
-lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@
+lib_evil_libdl_la_LIBADD = \
+@USE_EVIL_LIBS@ \
+@EVIL_DLFCN_LIBS@
+lib_evil_libdl_la_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Binary
@@ -154,22 +152,13 @@ bin_evil_evil_suite_SOURCES += bin/evil/memcpy_glibc_arm.S
#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
endif
-bin_evil_evil_suite_CPPFLAGS = \
--I$(top_srcdir)/src/lib/evil \
-@EVIL_CFLAGS@ \
-@EVIL_CPPFLAGS@
-
-bin_evil_evil_suite_LDADD = \
-lib/evil/libevil.la \
-lib/evil/libdl.la \
-@EVIL_LDFLAGS@ \
--lm
+bin_evil_evil_suite_CPPFLAGS = @EVIL_CFLAGS@
+bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm
+bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_LIBS@
bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
-
-bin_evil_test_evil_LDADD = \
-lib/evil/libevil.la \
-@EVIL_LDFLAGS@
+bin_evil_test_evil_LDADD = @USE_EVIL_LIBS@
+bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_LIBS@
endif
EXTRA_DIST += \
diff --git a/src/lib/ecore_evas/ecore_evas_buffer.c b/src/lib/ecore_evas/ecore_evas_buffer.c
index 69acea75ce..96e5fb6cfe 100644
--- a/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -3,6 +3,7 @@
#endif
#include "ecore_evas_buffer.h"
+#include <Evas_Engine_Buffer.h>
static void
_ecore_evas_buffer_free(Ecore_Evas *ee)
diff --git a/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c
index 4b80c305bf..4f52ae2cba 100644
--- a/src/lib/ecore_evas/ecore_evas_ews.c
+++ b/src/lib/ecore_evas/ecore_evas_ews.c
@@ -9,6 +9,8 @@
#include <Eina.h>
#include <Ecore.h>
#include "ecore_private.h"
+#include <Evas.h>
+#include <Evas_Engine_Buffer.h>
#include <Ecore_Input.h>
#include "ecore_evas_private.h"
diff --git a/src/lib/ecore_evas/ecore_evas_private.h b/src/lib/ecore_evas/ecore_evas_private.h
index 23d5f3c913..f9c208b23d 100644
--- a/src/lib/ecore_evas/ecore_evas_private.h
+++ b/src/lib/ecore_evas/ecore_evas_private.h
@@ -11,10 +11,6 @@
#define ECORE_MAGIC_EVAS 0x76543211
-#if defined(BUILD_ECORE_EVAS_BUFFER) || defined(BUILD_ECORE_EVAS_EWS)
-# include <Evas_Engine_Buffer.h>
-#endif
-
/** Log domain macros and variables **/
EAPI extern int _ecore_evas_log_dom;
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index 9813cb6163..aa96bbf579 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -28,7 +28,7 @@
#include <Ecore_Ipc.h>
#include "ecore_evas_buffer.h"
-
+#include <Evas_Engine_Buffer.h>
static const char *interface_extn_name = "extn";
static const int interface_extn_version = 1;