summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-20 19:25:51 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2012-12-20 19:25:51 +0000
commitb57e46b9b9e36367d9847516f8af6a0807b24b85 (patch)
tree703486d06a5f46131a2bda8801cf297039e9b86f /src/Makefile_Evas.am
parent5149aa925fefc8a80ba07968572bb9bedb79f3bf (diff)
efl: simplify linkage/usage of evil on windows.
instead of spreading it all around, just define 2 AC_SUBST() that will do the work. SVN revision: 81477
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am43
1 files changed, 12 insertions, 31 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index fbddad22b9..a07fabbe70 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -207,7 +207,8 @@ lib_evas_libevas_la_CPPFLAGS = \
207@EFL_CFLAGS@ \ 207@EFL_CFLAGS@ \
208@EFL_COV_CFLAGS@ \ 208@EFL_COV_CFLAGS@ \
209@EVAS_CFLAGS@ \ 209@EVAS_CFLAGS@ \
210@ALTIVEC_CFLAGS@ 210@ALTIVEC_CFLAGS@ \
211@USE_EVIL_CFLAGS@
211 212
212# SSE3 213# SSE3
213noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la 214noinst_LTLIBRARIES += lib/evas/common/libevas_op_blend_sse3.la
@@ -222,11 +223,6 @@ $(lib_evas_libevas_la_CPPFLAGS) \
222 223
223lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@ 224lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@
224 225
225if HAVE_WINDOWS
226lib_evas_libevas_la_CPPFLAGS += \
227-I$(top_srcdir)/src/lib/evil
228endif
229
230lib_evas_libevas_la_CXXFLAGS = 226lib_evas_libevas_la_CXXFLAGS =
231 227
232lib_evas_libevas_la_LIBADD = \ 228lib_evas_libevas_la_LIBADD = \
@@ -409,11 +405,8 @@ modules_evas_engines_buffer_module_la_CPPFLAGS = \
409-I$(top_srcdir)/src/lib/evas/cserve2 \ 405-I$(top_srcdir)/src/lib/evas/cserve2 \
410-DEFL_EVAS_BUILD \ 406-DEFL_EVAS_BUILD \
411@EFL_CFLAGS@ \ 407@EFL_CFLAGS@ \
412@EVAS_CFLAGS@ 408@EVAS_CFLAGS@ \
413if HAVE_WINDOWS 409@USE_EVIL_CFLAGS@
414modules_evas_engines_buffer_module_la_CPPFLAGS += \
415-I$(top_srcdir)/src/lib/evil
416endif
417modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ 410modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@
418modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version 411modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
419modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static 412modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -763,11 +756,8 @@ modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
763-DEFL_EVAS_BUILD \ 756-DEFL_EVAS_BUILD \
764@evas_engine_software_ddraw_cflags@ \ 757@evas_engine_software_ddraw_cflags@ \
765@EFL_CFLAGS@ \ 758@EFL_CFLAGS@ \
766@EVAS_CFLAGS@ 759@EVAS_CFLAGS@ \
767if HAVE_WINDOWS 760@USE_EVIL_CFLAGS@
768modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \
769-I$(top_srcdir)/src/lib/evil
770endif
771modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions 761modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
772modules_evas_engines_software_ddraw_module_la_LIBADD = \ 762modules_evas_engines_software_ddraw_module_la_LIBADD = \
773lib/evas/libevas.la \ 763lib/evas/libevas.la \
@@ -804,11 +794,8 @@ modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
804-DEFL_EVAS_BUILD \ 794-DEFL_EVAS_BUILD \
805@evas_engine_software_gdi_cflags@ \ 795@evas_engine_software_gdi_cflags@ \
806@EFL_CFLAGS@ \ 796@EFL_CFLAGS@ \
807@EVAS_CFLAGS@ 797@EVAS_CFLAGS@ \
808if HAVE_WINDOWS 798@USE_EVIL_CFLAGS@
809modules_evas_engines_software_gdi_module_la_CPPFLAGS += \
810-I$(top_srcdir)/src/lib/evil
811endif
812modules_evas_engines_software_gdi_module_la_LIBADD = \ 799modules_evas_engines_software_gdi_module_la_LIBADD = \
813lib/evas/libevas.la \ 800lib/evas/libevas.la \
814@evas_engine_software_gdi_libs@ \ 801@evas_engine_software_gdi_libs@ \
@@ -1325,11 +1312,8 @@ modules_evas_loaders_tiff_module_la_CPPFLAGS = \
1325-DEFL_EVAS_BUILD \ 1312-DEFL_EVAS_BUILD \
1326@evas_image_loader_tiff_cflags@ \ 1313@evas_image_loader_tiff_cflags@ \
1327@EFL_CFLAGS@ \ 1314@EFL_CFLAGS@ \
1328@EVAS_CFLAGS@ 1315@EVAS_CFLAGS@ \
1329if HAVE_WINDOWS 1316@USE_EVIL_CFLAGS@
1330modules_evas_loaders_tiff_module_la_CPPFLAGS += \
1331-I$(top_srcdir)/src/lib/evil
1332endif
1333modules_evas_loaders_tiff_module_la_LIBADD = \ 1317modules_evas_loaders_tiff_module_la_LIBADD = \
1334lib/evas/libevas.la \ 1318lib/evas/libevas.la \
1335@EFL_LIBS@ \ 1319@EFL_LIBS@ \
@@ -1349,11 +1333,8 @@ modules_evas_savers_tiff_module_la_CPPFLAGS = \
1349-DEFL_EVAS_BUILD \ 1333-DEFL_EVAS_BUILD \
1350@evas_image_loader_tiff_cflags@ \ 1334@evas_image_loader_tiff_cflags@ \
1351@EFL_CFLAGS@ \ 1335@EFL_CFLAGS@ \
1352@EVAS_CFLAGS@ 1336@EVAS_CFLAGS@ \
1353if HAVE_WINDOWS 1337@USE_EVIL_CFLAGS@
1354modules_evas_savers_tiff_module_la_CPPFLAGS += \
1355-I$(top_srcdir)/src/lib/evil
1356endif
1357modules_evas_savers_tiff_module_la_LIBADD = \ 1338modules_evas_savers_tiff_module_la_LIBADD = \
1358lib/evas/libevas.la \ 1339lib/evas/libevas.la \
1359@EFL_LIBS@ \ 1340@EFL_LIBS@ \