aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2019-04-15 11:53:42 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-04-15 13:34:20 +0100
commitf218ac741ccd832fc1e6f62bca0207882c293e54 (patch)
tree2bc8cbabc3f61784fa3dc84204a21d56cd5af964
parentelm test - add tests ofr other styles for panes provided by default (diff)
downloadefl-f218ac741ccd832fc1e6f62bca0207882c293e54.tar.gz
Windows : fix the definition of EAPI
Summary: with autotools, EFL_BUILD was passed to the preprocessor for libraries and binaries, which was wrong. Only libraries must have EFL_BUILD defined. See https://phab.enlightenment.org/T7797 for an explanation This also fix EAPI in Ecore_Getopt.g and Efl_UI.h Also note that all the wayland and drm Makefile's have not been touched Test Plan: compilation Reviewers: raster, zmike, cedric Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8602
-rw-r--r--m4/efl.m42
-rw-r--r--src/Makefile_EPhysics.am2
-rw-r--r--src/Makefile_Ecore.am1
-rw-r--r--src/Makefile_Ecore_Audio.am2
-rw-r--r--src/Makefile_Ecore_Avahi.am2
-rw-r--r--src/Makefile_Ecore_Con.am1
-rw-r--r--src/Makefile_Ecore_Evas.am4
-rw-r--r--src/Makefile_Ecore_File.am2
-rw-r--r--src/Makefile_Ecore_IMF.am1
-rw-r--r--src/Makefile_Ecore_IMF_Evas.am2
-rw-r--r--src/Makefile_Ecore_Input.am2
-rw-r--r--src/Makefile_Ecore_Input_Evas.am2
-rw-r--r--src/Makefile_Ecore_Ipc.am2
-rw-r--r--src/Makefile_Ecore_SDL.am2
-rw-r--r--src/Makefile_Ecore_Win32.am2
-rw-r--r--src/Makefile_Ecore_X.am1
-rw-r--r--src/Makefile_Ector.am1
-rw-r--r--src/Makefile_Edje.am2
-rw-r--r--src/Makefile_Eet.am1
-rw-r--r--src/Makefile_Eeze.am1
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/Makefile_Efl_Mono.am1
-rw-r--r--src/Makefile_Efreet.am6
-rw-r--r--src/Makefile_Eina.am7
-rw-r--r--src/Makefile_Eio.am2
-rw-r--r--src/Makefile_Eldbus.am1
-rw-r--r--src/Makefile_Elementary.am9
-rw-r--r--src/Makefile_Elocation.am2
-rw-r--r--src/Makefile_Elput.am1
-rw-r--r--src/Makefile_Elua.am1
-rw-r--r--src/Makefile_Embryo.am1
-rw-r--r--src/Makefile_Emile.am1
-rw-r--r--src/Makefile_Emotion.am7
-rw-r--r--src/Makefile_Eo.am3
-rw-r--r--src/Makefile_Eolian.am1
-rw-r--r--src/Makefile_Ethumb.am2
-rw-r--r--src/Makefile_Ethumb_Client.am2
-rw-r--r--src/Makefile_Evas.am43
-rw-r--r--src/Makefile_Evil.am2
-rw-r--r--src/lib/ecore/Ecore_Getopt.h3
-rw-r--r--src/lib/elementary/Efl_Ui.h70
41 files changed, 139 insertions, 63 deletions
diff --git a/m4/efl.m4 b/m4/efl.m4
index d051155e56..a01c5b401c 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -424,7 +424,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFLALL_COV_LIBS} ${EFLALL_LIBS}
m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
-m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall} -DEFL_BUILD=1"
+m4_defn([UP])_CFLAGS="${EFL_WINDOWS_VERSION_CFLAGS} ${EFLALL_COV_CFLAGS} ${EFLALL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/cxx/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_eflall}"
requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_eflall}"
requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_eflall}"
diff --git a/src/Makefile_EPhysics.am b/src/Makefile_EPhysics.am
index 708248a616..78d28d9f77 100644
--- a/src/Makefile_EPhysics.am
+++ b/src/Makefile_EPhysics.am
@@ -21,7 +21,7 @@ lib/ephysics/ephysics_quaternion.cpp \
lib/ephysics/ephysics_shape.cpp \
lib/ephysics/ephysics_world.cpp
-lib_ephysics_libephysics_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EPHYSICS_CFLAGS@
+lib_ephysics_libephysics_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EPHYSICS_CFLAGS@ -DEFL_BUILD
lib_ephysics_libephysics_la_LIBADD = @EPHYSICS_LIBS@
lib_ephysics_libephysics_la_DEPENDENCIES = @EPHYSICS_INTERNAL_LIBS@
lib_ephysics_libephysics_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 1b83d74fa5..649dbbec28 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -207,6 +207,7 @@ lib_ecore_libecore_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@ECORE_CFLAGS@
lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@ @EVIL_LIBS@
lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@
diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am
index 330a5129e2..695879f170 100644
--- a/src/Makefile_Ecore_Audio.am
+++ b/src/Makefile_Ecore_Audio.am
@@ -53,7 +53,7 @@ lib/ecore_audio/ecore_audio_obj_out.c \
lib/ecore_audio/ecore_audio_obj_in_tone.c \
lib/ecore_audio/ecore_audio_private.h
-lib_ecore_audio_libecore_audio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AUDIO_CFLAGS@ @ECORE_AUDIO_ALSA_CFLAGS@ @ECORE_AUDIO_PULSE_CFLAGS@ @ECORE_AUDIO_SNDFILE_CFLAGS@
+lib_ecore_audio_libecore_audio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AUDIO_CFLAGS@ @ECORE_AUDIO_ALSA_CFLAGS@ @ECORE_AUDIO_PULSE_CFLAGS@ @ECORE_AUDIO_SNDFILE_CFLAGS@ -DEFL_BUILD
lib_ecore_audio_libecore_audio_la_LIBADD = @ECORE_AUDIO_LIBS@ @ECORE_AUDIO_ALSA_LIBS@
lib_ecore_audio_libecore_audio_la_DEPENDENCIES = @ECORE_AUDIO_INTERNAL_LIBS@
lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Avahi.am b/src/Makefile_Ecore_Avahi.am
index 3dba43e6ca..0390020c78 100644
--- a/src/Makefile_Ecore_Avahi.am
+++ b/src/Makefile_Ecore_Avahi.am
@@ -10,7 +10,7 @@ lib/ecore_avahi/Ecore_Avahi.h
lib_ecore_avahi_libecore_avahi_la_SOURCES = \
lib/ecore_avahi/ecore_avahi.c
-lib_ecore_avahi_libecore_avahi_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AVAHI_CFLAGS@
+lib_ecore_avahi_libecore_avahi_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_AVAHI_CFLAGS@ -DEFL_BUILD
lib_ecore_avahi_libecore_avahi_la_LIBADD = @ECORE_AVAHI_LIBS@
lib_ecore_avahi_libecore_avahi_la_DEPENDENCIES = @ECORE_AVAHI_INTERNAL_LIBS@
lib_ecore_avahi_libecore_avahi_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index c51e38f2f4..594046b3c5 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -188,6 +188,7 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@ECORE_CON_CFLAGS@
lib_ecore_con_libecore_con_la_LIBADD = @ECORE_CON_LIBS@ @EVIL_LIBS@
lib_ecore_con_libecore_con_la_DEPENDENCIES = @ECORE_CON_INTERNAL_LIBS@
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 0c3c335679..8f74f95b0b 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -34,6 +34,7 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_evas\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@ECORE_EVAS_CFLAGS@
lib_ecore_evas_libecore_evas_la_LIBADD = @ECORE_EVAS_LIBS@
lib_ecore_evas_libecore_evas_la_DEPENDENCIES = @ECORE_EVAS_INTERNAL_LIBS@
@@ -83,6 +84,7 @@ $(install_ecoreevasenginexpkgLTLIBRARIES): install-libLTLIBRARIES
modules_ecore_evas_engines_x_module_la_SOURCES = $(XSOURCES)
modules_ecore_evas_engines_x_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@ECORE_EVAS_CFLAGS@ \
@ECORE_X_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/software_x11 \
@@ -193,6 +195,7 @@ $(install_ecoreevasenginesdlpkgLTLIBRARIES): install-libLTLIBRARIES
modules_ecore_evas_engines_sdl_module_la_SOURCES = $(SDLSOURCES)
modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@ECORE_EVAS_CFLAGS@ \
@ECORE_SDL_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/buffer \
@@ -220,6 +223,7 @@ $(install_ecoreevasengineswin32pkgLTLIBRARIES): install-libLTLIBRARIES
modules_ecore_evas_engines_win32_module_la_SOURCES = $(WIN32SOURCES)
modules_ecore_evas_engines_win32_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@ECORE_EVAS_CFLAGS@ \
@ECORE_WIN32_CFLAGS@ \
-I$(top_srcdir)/src/modules/evas/engines/software_ddraw \
diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am
index a31431508e..8f5924504f 100644
--- a/src/Makefile_Ecore_File.am
+++ b/src/Makefile_Ecore_File.am
@@ -27,7 +27,7 @@ lib/ecore_file/ecore_file_monitor_poll.c
endif
endif
-lib_ecore_file_libecore_file_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FILE_CFLAGS@
+lib_ecore_file_libecore_file_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_FILE_CFLAGS@ -DEFL_BUILD
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 c43f2a82c1..ac099c38bb 100644
--- a/src/Makefile_Ecore_IMF.am
+++ b/src/Makefile_Ecore_IMF.am
@@ -22,6 +22,7 @@ lib_ecore_imf_libecore_imf_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@ECORE_IMF_CFLAGS@
lib_ecore_imf_libecore_imf_la_LIBADD = @ECORE_IMF_LIBS@
lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@
diff --git a/src/Makefile_Ecore_IMF_Evas.am b/src/Makefile_Ecore_IMF_Evas.am
index abb3d57ae6..b2fd780713 100644
--- a/src/Makefile_Ecore_IMF_Evas.am
+++ b/src/Makefile_Ecore_IMF_Evas.am
@@ -9,7 +9,7 @@ lib_LTLIBRARIES += \
lib/ecore_imf_evas/libecore_imf_evas.la
lib_ecore_imf_evas_libecore_imf_evas_la_SOURCES = lib/ecore_imf_evas/ecore_imf_evas.c
-lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IMF_EVAS_CFLAGS@
+lib_ecore_imf_evas_libecore_imf_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IMF_EVAS_CFLAGS@ -DEFL_BUILD
lib_ecore_imf_evas_libecore_imf_evas_la_LIBADD = @ECORE_IMF_EVAS_LIBS@
lib_ecore_imf_evas_libecore_imf_evas_la_DEPENDENCIES = @ECORE_IMF_EVAS_INTERNAL_LIBS@
lib_ecore_imf_evas_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am
index a664cfba6d..0dc407bab5 100644
--- a/src/Makefile_Ecore_Input.am
+++ b/src/Makefile_Ecore_Input.am
@@ -15,7 +15,7 @@ lib/ecore_input/ecore_input_joystick.c \
lib/ecore_input/ecore_input_compose.h \
lib/ecore_input/ecore_input_private.h
-lib_ecore_input_libecore_input_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_CFLAGS@
+lib_ecore_input_libecore_input_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_CFLAGS@ -DEFL_BUILD
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@
diff --git a/src/Makefile_Ecore_Input_Evas.am b/src/Makefile_Ecore_Input_Evas.am
index b56efc3741..23bcb92cda 100644
--- a/src/Makefile_Ecore_Input_Evas.am
+++ b/src/Makefile_Ecore_Input_Evas.am
@@ -12,7 +12,7 @@ lib_ecore_input_evas_libecore_input_evas_la_SOURCES = \
lib/ecore_input_evas/ecore_input_evas.c \
lib/ecore_input_evas/ecore_input_evas_private.h
-lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_EVAS_CFLAGS@
+lib_ecore_input_evas_libecore_input_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_INPUT_EVAS_CFLAGS@ -DEFL_BUILD
lib_ecore_input_evas_libecore_input_evas_la_LIBADD = @ECORE_INPUT_EVAS_LIBS@
lib_ecore_input_evas_libecore_input_evas_la_DEPENDENCIES = @ECORE_INPUT_EVAS_INTERNAL_LIBS@
lib_ecore_input_evas_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am
index 4740b76253..0f09209f47 100644
--- a/src/Makefile_Ecore_Ipc.am
+++ b/src/Makefile_Ecore_Ipc.am
@@ -11,7 +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_builddir)/src/lib/efl @ECORE_IPC_CFLAGS@
+lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_IPC_CFLAGS@ -DEFL_BUILD
lib_ecore_ipc_libecore_ipc_la_LIBADD = @ECORE_IPC_LIBS@ @EVIL_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_SDL.am b/src/Makefile_Ecore_SDL.am
index 7262c2b324..88eec1bd10 100644
--- a/src/Makefile_Ecore_SDL.am
+++ b/src/Makefile_Ecore_SDL.am
@@ -13,7 +13,7 @@ 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_builddir)/src/lib/efl @ECORE_SDL_CFLAGS@
+lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_SDL_CFLAGS@ -DEFL_BUILD
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@
diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am
index c230a8b8f1..817eabe90b 100644
--- a/src/Makefile_Ecore_Win32.am
+++ b/src/Makefile_Ecore_Win32.am
@@ -28,7 +28,7 @@ lib/ecore_win32/ecore_win32_dnd_drop_source.h \
lib/ecore_win32/ecore_win32_dnd_drop_target.h \
lib/ecore_win32/ecore_win32_keysym_table.h
-lib_ecore_win32_libecore_win32_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WIN32_CFLAGS@
+lib_ecore_win32_libecore_win32_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WIN32_CFLAGS@ -DEFL_BUILD
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@
diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am
index 3b0252290b..636f745d90 100644
--- a/src/Makefile_Ecore_X.am
+++ b/src/Makefile_Ecore_X.am
@@ -49,6 +49,7 @@ lib/ecore_x/ecore_x_private.h
lib_ecore_x_libecore_x_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@ECORE_X_CFLAGS@ @ECORE_CON_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
diff --git a/src/Makefile_Ector.am b/src/Makefile_Ector.am
index 9288458fc3..52a6047067 100644
--- a/src/Makefile_Ector.am
+++ b/src/Makefile_Ector.am
@@ -161,6 +161,7 @@ lib_ector_libector_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/static_libs/freetype \
-I$(top_srcdir)/src/static_libs/draw \
-I$(top_srcdir)/src/static_libs/triangulator \
+-DEFL_BUILD \
@ECTOR_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 916ab65b98..aa1cd787e0 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -127,7 +127,7 @@ static_libs/buildsystem/buildsystem.h \
static_libs/buildsystem/buildsystem_autotools.c
-lib_edje_libedje_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS)
+lib_edje_libedje_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EDJE_COMMON_CPPFLAGS) -DEFL_BUILD
lib_edje_libedje_la_LIBADD = @EDJE_LIBS@ @EDJE_LUA_LIBS@
lib_edje_libedje_la_DEPENDENCIES = @EDJE_INTERNAL_LIBS@
lib_edje_libedje_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 6724cdb4a5..3dc86a5c6e 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -27,6 +27,7 @@ lib_eet_libeet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
+-DEFL_BUILD \
@EET_CFLAGS@ \
@NEON_CFLAGS@
lib_eet_libeet_la_LIBADD = @EET_LIBS@ @EVIL_LIBS@
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index 2e650d8069..5f8eb02605 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -53,6 +53,7 @@ lib_eeze_libeeze_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@EEZE_CFLAGS@
lib_eeze_libeeze_la_LIBADD = @EEZE_LIBS@
lib_eeze_libeeze_la_DEPENDENCIES = @EEZE_INTERNAL_LIBS@
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index c178a7d4dc..283c8b975c 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -139,7 +139,7 @@ lib/efl/interfaces/efl_text_markup_util.c \
lib/efl/interfaces/efl_ui_direction_readonly.c \
$(NULL)
-lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA
+lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA -DEFL_BUILD
lib_efl_libefl_la_LIBADD = @EFL_LIBS@
lib_efl_libefl_la_DEPENDENCIES = @EFL_INTERNAL_LIBS@
lib_efl_libefl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index 43f2a1c6e2..5c6d57e626 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -244,6 +244,7 @@ lib_efl_mono_libeflcustomexportsmono_la_SOURCES = \
lib_efl_mono_libeflcustomexportsmono_la_CPPFLAGS = \
-DEFL_BETA_API_SUPPORT \
-I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EFL_CUSTOM_EXPORTS_MONO_CFLAGS@
lib_efl_mono_libeflcustomexportsmono_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
lib_efl_mono_libeflcustomexportsmono_la_LIBADD = @EFL_CUSTOM_EXPORTS_MONO_LIBS@
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index a8aa02ff2f..c0ad0d7b60 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -49,21 +49,21 @@ lib/efreet/efreet_cache_private.h \
static_libs/buildsystem/buildsystem.h \
static_libs/buildsystem/buildsystem_autotools.c
-lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+lib_efreet_libefreet_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) -DEFL_BUILD
lib_efreet_libefreet_la_LIBADD = @EFREET_LIBS@ @EVIL_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 = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+lib_efreet_libefreet_mime_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) -DEFL_BUILD
lib_efreet_libefreet_mime_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_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 = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS)
+lib_efreet_libefreet_trash_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(EFREET_COMMON_CPPFLAGS) -DEFL_BUILD
lib_efreet_libefreet_trash_la_LIBADD = @USE_EFREET_LIBS@ @EVIL_LIBS@
lib_efreet_libefreet_trash_la_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index c274887438..40ef392965 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -210,7 +210,7 @@ einampchainedpool_LTLIBRARIES = modules/eina/mp/chained_pool/chained_pool_module
install_einampchainedpoolLTLIBRARIES = install-einampchainedpoolLTLIBRARIES
$(install_einampchainedpoolLTLIBRARIES): install-libLTLIBRARIES
-modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
+modules_eina_mp_chained_pool_chained_pool_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) -DEFL_BUILD
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@
@@ -229,7 +229,7 @@ einamponebig_LTLIBRARIES = modules/eina/mp/one_big/one_big_module.la
install_einamponebigLTLIBRARIES = install-einamponebigLTLIBRARIES
$(install_einamponebigLTLIBRARIES): install-libLTLIBRARIES
-modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
+modules_eina_mp_one_big_one_big_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) -DEFL_BUILD
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@
@@ -248,7 +248,7 @@ einamppassthrough_LTLIBRARIES = modules/eina/mp/pass_through/pass_through_module
install_einamppassthroughLTLIBRARIES = install-einamppassthroughLTLIBRARIES
$(install_einamppassthroughLTLIBRARIES): install-libLTLIBRARIES
-modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS)
+modules_eina_mp_pass_through_pass_through_module_la_CFLAGS = $(EINA_MODULE_COMMON_CFLAGS) -DEFL_BUILD
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@
@@ -262,6 +262,7 @@ lib_eina_libeina_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
+-DEFL_BUILD \
@VALGRIND_CFLAGS@
lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @UNWIND_LIBS@
diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am
index a92f13030b..aa75c5fbcf 100644
--- a/src/Makefile_Eio.am
+++ b/src/Makefile_Eio.am
@@ -61,7 +61,7 @@ endif
endif
endif
-lib_eio_libeio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EIO_CFLAGS@ @EFL_CFLAGS@
+lib_eio_libeio_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EIO_CFLAGS@ @EFL_CFLAGS@ -DEFL_BUILD
lib_eio_libeio_la_LIBADD = @EIO_LIBS@ @EFL_LIBS@
lib_eio_libeio_la_DEPENDENCIES = @EIO_INTERNAL_LIBS@ @EFL_INTERNAL_LIBS@
lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Eldbus.am b/src/Makefile_Eldbus.am
index bb786104d5..dace370ec2 100644
--- a/src/Makefile_Eldbus.am
+++ b/src/Makefile_Eldbus.am
@@ -84,6 +84,7 @@ lib/eldbus/eldbus_introspection.c
lib_eldbus_libeldbus_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-include $(top_builddir)/config.h \
+-DEFL_BUILD \
@ELDBUS_CFLAGS@ @EFL_CFLAGS@
lib_eldbus_libeldbus_la_LIBADD = @ELDBUS_LIBS@ @EFL_LIBS@
lib_eldbus_libeldbus_la_DEPENDENCIES = @ELDBUS_INTERNAL_LIBS@ @EFL_INTERNAL_LIBS@
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index fe0bf42c8c..f0e2b638cf 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1243,7 +1243,7 @@ lib_elementary_libelementary_la_CPPFLAGS = \
-DLOCALE_DIR=\"$(localedir)\" \
-DICON_DIR=\"$(datadir)/icons\" \
-DELM_TOP_BUILD_DIR=\"$(top_builddir)\" \
--DELEMENTARY_BUILD \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
if HAVE_WINDOWS
@@ -1558,6 +1558,7 @@ modules_elementary_access_output_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/elementary \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
modules_elementary_access_output_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
modules_elementary_access_output_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1585,6 +1586,7 @@ modules_elementary_clock_input_ctxpopup_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/elementary \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
modules_elementary_clock_input_ctxpopup_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
modules_elementary_clock_input_ctxpopup_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1640,6 +1642,7 @@ modules_elementary_prefs_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/elementary \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
if HAVE_WINDOWS
@@ -1674,6 +1677,7 @@ modules_elementary_test_entry_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/elementary \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
modules_elementary_test_entry_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
modules_elementary_test_entry_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1700,6 +1704,7 @@ modules_elementary_test_map_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/elementary \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
modules_elementary_test_map_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
modules_elementary_test_map_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1735,6 +1740,7 @@ modules_elementary_web_none_module_la_CPPFLAGS = \
-I$(top_builddir)/src/modules/elementary/web/none \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
modules_elementary_web_none_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
modules_elementary_web_none_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
@@ -1804,6 +1810,7 @@ edje_external_elementary_module_la_CPPFLAGS = \
-I$(top_builddir)/src/edje_externals \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DEFL_BUILD \
@ELEMENTARY_CFLAGS@
edje_external_elementary_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
edje_external_elementary_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
diff --git a/src/Makefile_Elocation.am b/src/Makefile_Elocation.am
index 292f4738be..d9c5a489a8 100644
--- a/src/Makefile_Elocation.am
+++ b/src/Makefile_Elocation.am
@@ -17,7 +17,7 @@ lib/elocation/gen/eldbus_geo_clue2_client.c \
lib/elocation/gen/eldbus_geo_clue2_location.c \
lib/elocation/gen/eldbus_geo_clue2_manager.c
-lib_elocation_libelocation_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELOCATION_CFLAGS@ @EFL_CFLAGS@
+lib_elocation_libelocation_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELOCATION_CFLAGS@ @EFL_CFLAGS@ -DEFL_BUILD
lib_elocation_libelocation_la_LIBADD = @ELOCATION_LIBS@
lib_elocation_libelocation_la_DEPENDENCIES = @ELOCATION_INTERNAL_LIBS@
lib_elocation_libelocation_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/Makefile_Elput.am b/src/Makefile_Elput.am
index d2b97930ce..a3abb335b3 100644
--- a/src/Makefile_Elput.am
+++ b/src/Makefile_Elput.am
@@ -19,6 +19,7 @@ lib/elput/elput_private.h
lib_elput_libelput_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
+ -DEFL_BUILD \
@ELPUT_CFLAGS@ @EFL_CFLAGS@ \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DMODULE_ARCH=\"$(MODULE_ARCH)\"
diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
index 5b1004b884..069a33c0ef 100644
--- a/src/Makefile_Elua.am
+++ b/src/Makefile_Elua.am
@@ -13,6 +13,7 @@ lib_elua_libelua_la_SOURCES = \
lib/elua/cache.c
lib_elua_libelua_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
+ -DEFL_BUILD \
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index f5e187c8f2..be764f4f92 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -20,6 +20,7 @@ lib_embryo_libembryo_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
+-DEFL_BUILD \
@EMBRYO_CFLAGS@
lib_embryo_libembryo_la_LIBADD = @EMBRYO_LIBS@
lib_embryo_libembryo_la_DEPENDENCIES = @EMBRYO_INTERNAL_LIBS@
diff --git a/src/Makefile_Emile.am b/src/Makefile_Emile.am
index 90834cfc3f..59ac7bb4e9 100644
--- a/src/Makefile_Emile.am
+++ b/src/Makefile_Emile.am
@@ -44,6 +44,7 @@ lib_emile_libemile_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emile\" \
+-DEFL_BUILD \
@EMILE_CFLAGS@ \
@NEON_CFLAGS@
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 639557ea53..2de10651c2 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -47,6 +47,7 @@ lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@EMOTION_CFLAGS@
lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@
@@ -74,6 +75,7 @@ $(install_emotionmodulexineLTLIBRARIES): install-libLTLIBRARIES
modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
modules_emotion_xine_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EMOTION_CFLAGS@ \
@EMOTION_MODULE_XINE_CFLAGS@
modules_emotion_xine_module_la_LIBADD = \
@@ -108,6 +110,7 @@ $(install_emotionmodulegstreamerLTLIBRARIES): install-libLTLIBRARIES
modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
modules_emotion_gstreamer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EMOTION_CFLAGS@ \
@EMOTION_MODULE_GSTREAMER_CFLAGS@
modules_emotion_gstreamer_module_la_LIBADD = \
@@ -146,6 +149,7 @@ $(install_emotionmodulegstreamer1LTLIBRARIES): install-libLTLIBRARIES
modules_emotion_gstreamer1_module_la_SOURCES = $(EMOTION_GSTREAMER1_SOURCES)
modules_emotion_gstreamer1_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EMOTION_CFLAGS@ \
@EMOTION_MODULE_GSTREAMER1_CFLAGS@
modules_emotion_gstreamer1_module_la_LIBADD = \
@@ -175,6 +179,7 @@ $(install_emotionmodulelibvlcLTLIBRARIES): install-libLTLIBRARIES
modules_emotion_libvlc_module_la_SOURCES = $(EMOTION_LIBVLC_SOURCES)
modules_emotion_libvlc_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EMOTION_CFLAGS@ \
@EMOTION_MODULE_LIBVLC_CFLAGS@
modules_emotion_libvlc_module_la_LIBADD = \
@@ -205,6 +210,7 @@ $(install_emotionmodulegenericLTLIBRARIES): install-libLTLIBRARIES
modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
modules_emotion_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EMOTION_CFLAGS@ \
@EMOTION_MODULE_GENERIC_CFLAGS@ \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -237,6 +243,7 @@ $(install_emotionedjeexternalLTLIBRARIES): install-libLTLIBRARIES
edje_external_emotion_module_la_SOURCES = \
edje_external/emotion/emotion.c
edje_external_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EDJE_CFLAGS@ \
@EMOTION_CFLAGS@ \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 68a8c02f3e..19179a78c3 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -35,6 +35,7 @@ lib/eo/eo_private.h
lib_eo_libeo_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
@EO_CFLAGS@ \
@VALGRIND_CFLAGS@
lib_eo_libeo_la_LIBADD = @EO_LIBS@
@@ -43,7 +44,7 @@ lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### The Eo debug build
lib_eo_libeo_dbg_la_SOURCES = $(lib_eo_libeo_la_SOURCES)
-lib_eo_libeo_dbg_la_CPPFLAGS = $(lib_eo_libeo_la_CPPFLAGS) -DEO_DEBUG
+lib_eo_libeo_dbg_la_CPPFLAGS = $(lib_eo_libeo_la_CPPFLAGS) -DEO_DEBUG -DEFL_BUILD
lib_eo_libeo_dbg_la_LIBADD = $(lib_eo_libeo_la_LIBADD)
lib_eo_libeo_dbg_la_DEPENDENCIES = $(lib_eo_libeo_la_DEPENDENCIES)
lib_eo_libeo_dbg_la_LDFLAGS = $(lib_eo_libeo_la_LDFLAGS)
diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am
index 06c7638c8e..c75394e03f 100644
--- a/src/Makefile_Eolian.am
+++ b/src/Makefile_Eolian.am
@@ -40,6 +40,7 @@ lib_eolian_libeolian_la_SOURCES = \
lib/eolian/eolian_aux.c
lib_eolian_libeolian_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EOLIAN_CFLAGS@ \
+ -DEFL_BUILD \
-DPACKAGE_DATA_DIR=\"$(datadir)/eolian\"
lib_eolian_libeolian_la_LIBADD = @EOLIAN_LIBS@
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index f359ef434b..6d9f0cb0ce 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -22,6 +22,7 @@ lib_ethumb_libethumb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@ETHUMB_CFLAGS@
lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
@@ -46,6 +47,7 @@ modules_ethumb_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
+-DEFL_BUILD \
@EMOTION_CFLAGS@ \
@ETHUMB_CFLAGS@
modules_ethumb_emotion_module_la_LIBADD = \
diff --git a/src/Makefile_Ethumb_Client.am b/src/Makefile_Ethumb_Client.am
index 6b37b34dbd..a319f5da02 100644
--- a/src/Makefile_Ethumb_Client.am
+++ b/src/Makefile_Ethumb_Client.am
@@ -9,7 +9,7 @@ lib/ethumb_client/Ethumb_Client.h
# libethumb_client.la
lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb_client/ethumb_client.c
-lib_ethumb_client_libethumb_client_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@
+lib_ethumb_client_libethumb_client_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ETHUMB_CLIENT_CFLAGS@ -DEFL_BUILD
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@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 3dc49ce4d5..22b36669af 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -526,6 +526,7 @@ lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@VALGRIND_CFLAGS@ \
@NEON_CFLAGS@ \
@@ -540,6 +541,7 @@ lib/evas/common/evas_op_blend/op_blend_master_sse3.c \
static_libs/draw/draw_main_sse2.c
lib_evas_common_libevas_op_blend_sse3_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
$(lib_evas_libevas_la_CPPFLAGS) \
@SSE3_CFLAGS@
@@ -553,6 +555,7 @@ lib_evas_common_libevas_convert_rgb_32_la_SOURCES = \
lib/evas/common/evas_convert_rgb_32.c
lib_evas_common_libevas_convert_rgb_32_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
+-DEFL_BUILD \
$(lib_evas_libevas_la_CPPFLAGS) \
@NEON_CFLAGS@
@@ -788,6 +791,7 @@ modules_evas_engines_software_generic_module_la_CPPFLAGS = -I$(top_builddir)/src
-I$(top_srcdir)/src/lib/evas/filters \
-I$(top_builddir)/src/lib/evas/canvas \
-I$(top_builddir)/src/modules/evas/engines/software_generic \
+-DEFL_BUILD \
@EVAS_CFLAGS@
modules_evas_engines_software_generic_module_la_LIBADD = @USE_EVAS_LIBS@
modules_evas_engines_software_generic_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@@ -815,6 +819,7 @@ $(install_enginebufferpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES)
modules_evas_engines_buffer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@
modules_evas_engines_buffer_module_la_LIBADD = @USE_EVAS_LIBS@
modules_evas_engines_buffer_module_la_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
@@ -1026,6 +1031,7 @@ modules_evas_engines_gl_generic_module_la_CFLAGS = \
-I$(top_builddir)/src/modules/evas/engines/gl_generic \
-I$(top_builddir)/src/modules/evas/engines/software_generic \
@evas_engine_gl_common_cflags@ \
+-DEFL_BUILD \
@EVAS_CFLAGS@
modules_evas_engines_gl_generic_module_la_LIBADD = \
modules/evas/engines/gl_common/libevas_engine_gl_common.la \
@@ -1038,7 +1044,7 @@ modules_evas_engines_gl_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_evas_engines_gl_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
if BUILD_ENGINE_GL_X11
-modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_xlib_cflags@ -DEFL_BUILD
endif
if BUILD_ENGINE_WAYLAND_EGL
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_wayland_egl_cflags@
@@ -1047,7 +1053,7 @@ if BUILD_ENGINE_GL_DRM
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_drm_cflags@
endif
if BUILD_ENGINE_EGLFS
-modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_eglfs_cflags@
+modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_eglfs_cflags@ -DEFL_BUILD
endif
if BUILD_ENGINE_GL_COCOA
modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS += @evas_engine_gl_cocoa_cflags@
@@ -1120,6 +1126,7 @@ modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES)
modules_evas_engines_gl_sdl_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/modules/evas/engines/gl_common \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_engine_gl_sdl_cflags@
modules_evas_engines_gl_sdl_module_la_LIBADD = \
@@ -1154,6 +1161,7 @@ $(install_engineglx11pkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES)
modules_evas_engines_gl_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_engine_gl_xlib_cflags@
modules_evas_engines_gl_x11_module_la_LIBADD = \
@@ -1199,6 +1207,7 @@ $(install_enginesoftwareddrawpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES)
modules_evas_engines_software_ddraw_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_engine_software_ddraw_cflags@
modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
@@ -1235,6 +1244,7 @@ $(install_enginesoftwaregdipkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES)
modules_evas_engines_software_gdi_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_engine_software_gdi_cflags@
modules_evas_engines_software_gdi_module_la_LIBADD = \
@@ -1292,7 +1302,7 @@ install_enginesoftwarex11pkgLTLIBRARIES = install-enginesoftwarex11pkgLTLIBRARIE
$(install_enginesoftwarex11pkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_engines_software_x11_module_la_SOURCES = $(SOFTWARE_X11_SOURCES)
-modules_evas_engines_software_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(SOFTWARE_X11_CPPFLAGS)
+modules_evas_engines_software_x11_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl $(SOFTWARE_X11_CPPFLAGS) -DEFL_BUILD
modules_evas_engines_software_x11_module_la_LIBADD = @USE_ECORE_X_LIBS@ @USE_EVAS_LIBS@ $(SOFTWARE_X11_LIBADD)
modules_evas_engines_software_x11_module_la_DEPENDENCIES = @USE_ECORE_X_INTERNAL_LIBS@ @USE_EVAS_INTERNAL_LIBS@
modules_evas_engines_software_x11_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
@@ -1476,6 +1486,7 @@ modules_evas_engines_eglfs_module_la_SOURCES = $(EGLFS_SOURCES)
modules_evas_engines_eglfs_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/modules/evas/engines/eglfs \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@ECORE_DRM_CFLAGS@ \
@evas_engine_eglfs_cflags@
@@ -1514,6 +1525,7 @@ static_libs/vg_common/vg_common.h
modules_evas_vg_loaders_svg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/static_libs/vg_common \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_vg_loader_svg_cflags@
modules_evas_vg_loaders_svg_module_la_LIBADD = \
@@ -1537,6 +1549,7 @@ static_libs/vg_common/vg_common.h
modules_evas_vg_savers_svg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
-I$(top_srcdir)/src/static_libs/vg_common \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_vg_saver_svg_cflags@
modules_evas_vg_savers_svg_module_la_LIBADD = \
@@ -1565,6 +1578,7 @@ $(install_vgloadereetpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_vg_loaders_eet_module_la_SOURCES = modules/evas/vg_loaders/eet/evas_vg_load_eet.c
modules_evas_vg_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_vg_loader_eet_cflags@
modules_evas_vg_loaders_eet_module_la_LIBADD = \
@@ -1585,6 +1599,7 @@ $(install_vgsavereetpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_vg_savers_eet_module_la_SOURCES = modules/evas/vg_savers/eet/evas_vg_save_eet.c
modules_evas_vg_savers_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_vg_saver_eet_cflags@
modules_evas_vg_savers_eet_module_la_LIBADD = \
@@ -1614,6 +1629,7 @@ $(install_loaderbmppkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_bmp_module_la_SOURCES = modules/evas/image_loaders/bmp/evas_image_load_bmp.c
modules_evas_image_loaders_bmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_bmp_cflags@
modules_evas_image_loaders_bmp_module_la_LIBADD = \
@@ -1648,6 +1664,7 @@ modules/evas/image_loaders/dds/s3tc_decoder.c \
modules/evas/image_loaders/dds/s3tc.h
modules_evas_image_loaders_dds_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_dds_cflags@
modules_evas_image_loaders_dds_module_la_LIBADD = \
@@ -1676,6 +1693,7 @@ $(install_loadereetpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_eet_module_la_SOURCES = modules/evas/image_loaders/eet/evas_image_load_eet.c
modules_evas_image_loaders_eet_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_eet_cflags@
modules_evas_image_loaders_eet_module_la_LIBADD = \
@@ -1704,6 +1722,7 @@ $(install_loadergenericpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_generic_module_la_SOURCES = modules/evas/image_loaders/generic/evas_image_load_generic.c
modules_evas_image_loaders_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_generic_cflags@
modules_evas_image_loaders_generic_module_la_LIBADD = \
@@ -1732,6 +1751,7 @@ $(install_loadergifpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_gif_module_la_SOURCES = modules/evas/image_loaders/gif/evas_image_load_gif.c
modules_evas_image_loaders_gif_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_gif_cflags@
modules_evas_image_loaders_gif_module_la_LIBADD = \
@@ -1760,6 +1780,7 @@ $(install_loadericopkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_ico_module_la_SOURCES = modules/evas/image_loaders/ico/evas_image_load_ico.c
modules_evas_image_loaders_ico_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_ico_cflags@
modules_evas_image_loaders_ico_module_la_LIBADD = \
@@ -1789,6 +1810,7 @@ $(install_loaderjpegpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_jpeg_module_la_SOURCES = modules/evas/image_loaders/jpeg/evas_image_load_jpeg.c
modules_evas_image_loaders_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_jpeg_cflags@
modules_evas_image_loaders_jpeg_module_la_LIBADD = \
@@ -1808,6 +1830,7 @@ $(install_saverjpegpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_savers_jpeg_module_la_SOURCES = modules/evas/image_savers/jpeg/evas_image_save_jpeg.c
modules_evas_image_savers_jpeg_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_jpeg_cflags@
modules_evas_image_savers_jpeg_module_la_LIBADD = \
@@ -1838,6 +1861,7 @@ modules_evas_image_loaders_jp2k_module_la_CPPFLAGS = \
@evas_image_loader_jp2k_cflags@ \
-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@
modules_evas_image_loaders_jp2k_module_la_LIBADD = \
@USE_EVAS_LIBS@ \
@@ -1865,6 +1889,7 @@ $(install_loaderpmapspkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_pmaps_module_la_SOURCES = modules/evas/image_loaders/pmaps/evas_image_load_pmaps.c
modules_evas_image_loaders_pmaps_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_pmaps_cflags@
modules_evas_image_loaders_pmaps_module_la_LIBADD = \
@@ -1893,6 +1918,7 @@ $(install_loaderpngpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_png_module_la_SOURCES = modules/evas/image_loaders/png/evas_image_load_png.c
modules_evas_image_loaders_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_png_cflags@
modules_evas_image_loaders_png_module_la_LIBADD = \
@@ -1913,6 +1939,7 @@ $(install_saverpngpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_savers_png_module_la_SOURCES = modules/evas/image_savers/png/evas_image_save_png.c
modules_evas_image_savers_png_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_png_cflags@
modules_evas_image_savers_png_module_la_LIBADD = \
@@ -1941,6 +1968,7 @@ $(install_loaderpsdpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_psd_module_la_SOURCES = modules/evas/image_loaders/psd/evas_image_load_psd.c
modules_evas_image_loaders_psd_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_psd_cflags@
modules_evas_image_loaders_psd_module_la_LIBADD = \
@@ -1969,6 +1997,7 @@ $(install_loadertgapkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_tga_module_la_SOURCES = modules/evas/image_loaders/tga/evas_image_load_tga.c
modules_evas_image_loaders_tga_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_tga_cflags@
modules_evas_image_loaders_tga_module_la_LIBADD = \
@@ -1997,6 +2026,7 @@ $(install_loadertiffpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_tiff_module_la_SOURCES = modules/evas/image_loaders/tiff/evas_image_load_tiff.c
modules_evas_image_loaders_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_tiff_cflags@
modules_evas_image_loaders_tiff_module_la_LIBADD = \
@@ -2017,6 +2047,7 @@ $(install_savertiffpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_savers_tiff_module_la_SOURCES = modules/evas/image_savers/tiff/evas_image_save_tiff.c
modules_evas_image_savers_tiff_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_tiff_cflags@
modules_evas_image_savers_tiff_module_la_LIBADD = \
@@ -2045,6 +2076,7 @@ $(install_loaderwbmppkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_wbmp_module_la_SOURCES = modules/evas/image_loaders/wbmp/evas_image_load_wbmp.c
modules_evas_image_loaders_wbmp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_wbmp_cflags@
modules_evas_image_loaders_wbmp_module_la_LIBADD = \
@@ -2073,6 +2105,7 @@ $(install_loaderwebppkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_webp_module_la_SOURCES = modules/evas/image_loaders/webp/evas_image_load_webp.c
modules_evas_image_loaders_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_webp_cflags@
modules_evas_image_loaders_webp_module_la_LIBADD = \
@@ -2093,6 +2126,7 @@ $(install_saverwebppkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_savers_webp_module_la_SOURCES = modules/evas/image_savers/webp/evas_image_save_webp.c
modules_evas_image_savers_webp_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_webp_cflags@
modules_evas_image_savers_webp_module_la_LIBADD = \
@@ -2121,6 +2155,7 @@ $(install_loaderxpmpkgLTLIBRARIES): install-libLTLIBRARIES
modules_evas_image_loaders_xpm_module_la_SOURCES = modules/evas/image_loaders/xpm/evas_image_load_xpm.c
modules_evas_image_loaders_xpm_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/evas/include \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_loader_xpm_cflags@
modules_evas_image_loaders_xpm_module_la_LIBADD = \
@@ -2175,6 +2210,7 @@ modules_evas_image_loaders_tgv_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/static_libs/rg_etc \
-I$(top_srcdir)/src/lib/evas/ \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@NEON_CFLAGS@
if ! ENABLE_LIBLZ4
@@ -2211,6 +2247,7 @@ modules_evas_image_savers_tgv_module_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/static_libs/rg_etc \
-I$(top_srcdir)/src/lib/evas/ \
+-DEFL_BUILD \
@EVAS_CFLAGS@ \
@evas_image_saver_tgv_cflags@
if ! ENABLE_LIBLZ4
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index c18e0eab4b..91dcc1c7f1 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -47,7 +47,7 @@ lib/evil/evil_util.c \
lib/evil/evil_private.h \
lib/evil/evil_fnmatch_private.h
-lib_evil_libevil_la_CPPFLAGS = @EVIL_CPPFLAGS@
+lib_evil_libevil_la_CPPFLAGS = @EVIL_CPPFLAGS@ -DEFL_BUILD
lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ @EVIL_CFLAGS_WRN@ -D__USE_MINGW_ANSI_STDIO
lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/lib/ecore/Ecore_Getopt.h b/src/lib/ecore/Ecore_Getopt.h
index a4f188c8c2..7a038f744a 100644
--- a/src/lib/ecore/Ecore_Getopt.h
+++ b/src/lib/ecore/Ecore_Getopt.h
@@ -1215,4 +1215,7 @@ EAPI Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, con
* @}
*/
+#undef EAPI
+#define EAPI
+
#endif /* _ECORE_GETOPT_H */
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 22e446a998..246ebf8456 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -53,41 +53,6 @@
#include <Eo.h>
#include <Efl.h>
-#ifdef EAPI
-# undef EAPI
-#endif
-#ifdef EWAPI
-# undef EWAPI
-#endif
-
-#ifdef _WIN32
-# ifdef EFL_BUILD
-# ifdef DLL_EXPORT
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI
-# endif
-# else
-# define EAPI __declspec(dllimport)
-# endif
-# define EAPI_WEAK
-#else
-# ifdef __GNUC__
-# if __GNUC__ >= 4
-# define EAPI __attribute__ ((visibility("default")))
-# define EAPI_WEAK __attribute__ ((weak))
-# else
-# define EAPI
-# define EAPI_WEAK
-# endif
-# else
-# define EAPI
-# define EAPI_WEAK
-# endif
-#endif
-
-#define EWAPI EAPI EAPI_WEAK
-
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# include <winsock2.h>
@@ -133,6 +98,41 @@
#include <EMap.h>
#endif
+#ifdef EAPI
+# undef EAPI
+#endif
+#ifdef EWAPI
+# undef EWAPI
+#endif
+
+#ifdef _WIN32
+# ifdef EFL_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif
+# else
+# define EAPI __declspec(dllimport)
+# endif
+# define EAPI_WEAK
+#else
+# ifdef __GNUC__
+# if __GNUC__ >= 4
+# define EAPI __attribute__ ((visibility("default")))
+# define EAPI_WEAK __attribute__ ((weak))
+# else
+# define EAPI
+# define EAPI_WEAK
+# endif
+# else
+# define EAPI
+# define EAPI_WEAK
+# endif
+#endif
+
+#define EWAPI EAPI EAPI_WEAK
+
#ifdef __cplusplus
extern "C" {
#endif