summaryrefslogtreecommitdiff
path: root/src/Makefile_Emotion.am
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 /src/Makefile_Emotion.am
parent01f634b7db9f511f51e49b5823e20fb28243db30 (diff)
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 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
Diffstat (limited to 'src/Makefile_Emotion.am')
-rw-r--r--src/Makefile_Emotion.am7
1 files changed, 7 insertions, 0 deletions
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 \
47-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ 47-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
48-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ 48-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
49-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \ 49-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
50-DEFL_BUILD \
50@EMOTION_CFLAGS@ 51@EMOTION_CFLAGS@
51lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@ 52lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
52lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@ 53lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@
@@ -74,6 +75,7 @@ $(install_emotionmodulexineLTLIBRARIES): install-libLTLIBRARIES
74 75
75modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES) 76modules_emotion_xine_module_la_SOURCES = $(EMOTION_XINE_SOURCES)
76modules_emotion_xine_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 77modules_emotion_xine_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
78-DEFL_BUILD \
77@EMOTION_CFLAGS@ \ 79@EMOTION_CFLAGS@ \
78@EMOTION_MODULE_XINE_CFLAGS@ 80@EMOTION_MODULE_XINE_CFLAGS@
79modules_emotion_xine_module_la_LIBADD = \ 81modules_emotion_xine_module_la_LIBADD = \
@@ -108,6 +110,7 @@ $(install_emotionmodulegstreamerLTLIBRARIES): install-libLTLIBRARIES
108 110
109modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES) 111modules_emotion_gstreamer_module_la_SOURCES = $(EMOTION_GSTREAMER_SOURCES)
110modules_emotion_gstreamer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 112modules_emotion_gstreamer_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
113-DEFL_BUILD \
111@EMOTION_CFLAGS@ \ 114@EMOTION_CFLAGS@ \
112@EMOTION_MODULE_GSTREAMER_CFLAGS@ 115@EMOTION_MODULE_GSTREAMER_CFLAGS@
113modules_emotion_gstreamer_module_la_LIBADD = \ 116modules_emotion_gstreamer_module_la_LIBADD = \
@@ -146,6 +149,7 @@ $(install_emotionmodulegstreamer1LTLIBRARIES): install-libLTLIBRARIES
146 149
147modules_emotion_gstreamer1_module_la_SOURCES = $(EMOTION_GSTREAMER1_SOURCES) 150modules_emotion_gstreamer1_module_la_SOURCES = $(EMOTION_GSTREAMER1_SOURCES)
148modules_emotion_gstreamer1_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 151modules_emotion_gstreamer1_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
152-DEFL_BUILD \
149@EMOTION_CFLAGS@ \ 153@EMOTION_CFLAGS@ \
150@EMOTION_MODULE_GSTREAMER1_CFLAGS@ 154@EMOTION_MODULE_GSTREAMER1_CFLAGS@
151modules_emotion_gstreamer1_module_la_LIBADD = \ 155modules_emotion_gstreamer1_module_la_LIBADD = \
@@ -175,6 +179,7 @@ $(install_emotionmodulelibvlcLTLIBRARIES): install-libLTLIBRARIES
175 179
176modules_emotion_libvlc_module_la_SOURCES = $(EMOTION_LIBVLC_SOURCES) 180modules_emotion_libvlc_module_la_SOURCES = $(EMOTION_LIBVLC_SOURCES)
177modules_emotion_libvlc_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 181modules_emotion_libvlc_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
182-DEFL_BUILD \
178@EMOTION_CFLAGS@ \ 183@EMOTION_CFLAGS@ \
179@EMOTION_MODULE_LIBVLC_CFLAGS@ 184@EMOTION_MODULE_LIBVLC_CFLAGS@
180modules_emotion_libvlc_module_la_LIBADD = \ 185modules_emotion_libvlc_module_la_LIBADD = \
@@ -205,6 +210,7 @@ $(install_emotionmodulegenericLTLIBRARIES): install-libLTLIBRARIES
205 210
206modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES) 211modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
207modules_emotion_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 212modules_emotion_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
213-DEFL_BUILD \
208@EMOTION_CFLAGS@ \ 214@EMOTION_CFLAGS@ \
209@EMOTION_MODULE_GENERIC_CFLAGS@ \ 215@EMOTION_MODULE_GENERIC_CFLAGS@ \
210-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 216-DPACKAGE_BIN_DIR=\"$(bindir)\" \
@@ -237,6 +243,7 @@ $(install_emotionedjeexternalLTLIBRARIES): install-libLTLIBRARIES
237edje_external_emotion_module_la_SOURCES = \ 243edje_external_emotion_module_la_SOURCES = \
238edje_external/emotion/emotion.c 244edje_external/emotion/emotion.c
239edje_external_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 245edje_external_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
246-DEFL_BUILD \
240@EDJE_CFLAGS@ \ 247@EDJE_CFLAGS@ \
241@EMOTION_CFLAGS@ \ 248@EMOTION_CFLAGS@ \
242-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" 249-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"