summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-06 23:07:05 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-06 23:07:05 +0000
commitc163de7b32e38b99961c7bf65ab78e8ce1c013e2 (patch)
treefc3365e854d6bf463323c8063ff56e8d8293e13c
parent51db47a9d3bd29ba51a9db0c869543c679b66085 (diff)
merge: fix compilation on Windows
SVN revision: 78952
Diffstat (limited to '')
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile_Eina.am4
-rw-r--r--src/Makefile_Eo.am6
-rw-r--r--src/Makefile_Evas.am55
-rw-r--r--src/Makefile_Evil.am8
5 files changed, 67 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 624c8fb093..de147dee97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,7 +397,7 @@ case "$host_os" in
397 EVIL_DLFCN_LIBS="-ltoolhelp" 397 EVIL_DLFCN_LIBS="-ltoolhelp"
398 ;; 398 ;;
399 *) 399 *)
400 EVIL_LIBS="-luuid -lole32 -lws2_32 -lsecur32" 400 EVIL_LIBS="-lole32 -lws2_32 -lsecur32 -luuid"
401 EVIL_DLFCN_LIBS="-lpsapi" 401 EVIL_DLFCN_LIBS="-lpsapi"
402 ;; 402 ;;
403esac 403esac
@@ -1194,7 +1194,6 @@ case "$host_os" in
1194 mingw*) 1194 mingw*)
1195 want_evas_engine_software_gdi="yes" 1195 want_evas_engine_software_gdi="yes"
1196 want_evas_engine_software_ddraw="yes" 1196 want_evas_engine_software_ddraw="yes"
1197 want_evas_engine_direct3d="yes"
1198 ;; 1197 ;;
1199 darwin*) 1198 darwin*)
1200 want_evas_engine_software_xlib="auto" 1199 want_evas_engine_software_xlib="auto"
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 676222e089..6370a98017 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -227,8 +227,8 @@ lib_eina_libeina_la_LIBADD = @EINA_LIBS@
227 227
228if HAVE_WINDOWS 228if HAVE_WINDOWS
229lib_eina_libeina_la_LIBADD += \ 229lib_eina_libeina_la_LIBADD += \
230$(top_builddir)/src/lib/evil/libevil.la \ 230lib/evil/libevil.la \
231$(top_builddir)/src/lib/evil/libdl.la 231lib/evil/libdl.la
232endif 232endif
233 233
234lib_eina_libeina_la_LIBADD += -lm 234lib_eina_libeina_la_LIBADD += -lm
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 6000066ef7..d43f34e14d 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -21,6 +21,12 @@ lib_eo_libeo_la_CPPFLAGS = \
21@EFL_CFLAGS@ \ 21@EFL_CFLAGS@ \
22@EO_CFLAGS@ 22@EO_CFLAGS@
23 23
24if HAVE_WINDOWS
25lib_eo_libeo_la_CPPFLAGS += \
26-I$(top_srcdir)/src/lib/evil \
27-I$(top_builddir)/src/lib/evil
28endif
29
24lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ 30lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@
25 31
26lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 32lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 32d2ffaf3a..420b4913fc 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -211,6 +211,7 @@ lib_evas_libevas_la_CPPFLAGS = \
211-I$(top_builddir)/src/lib/eo \ 211-I$(top_builddir)/src/lib/eo \
212-I$(top_srcdir)/src/lib/eet \ 212-I$(top_srcdir)/src/lib/eet \
213-I$(top_builddir)/src/lib/eet \ 213-I$(top_builddir)/src/lib/eet \
214-DEFL_EVAS_BUILD \
214-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 215-DPACKAGE_BIN_DIR=\"$(bindir)\" \
215-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 216-DPACKAGE_LIB_DIR=\"$(libdir)\" \
216-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \ 217-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
@@ -381,6 +382,7 @@ modules_evas_engines_software_generic_module_la_CPPFLAGS = \
381-I$(top_builddir)/src/lib/evas/include \ 382-I$(top_builddir)/src/lib/evas/include \
382-I$(top_srcdir)/src/lib/evas/cserve2 \ 383-I$(top_srcdir)/src/lib/evas/cserve2 \
383-I$(top_builddir)/src/lib/evas/cserve2 \ 384-I$(top_builddir)/src/lib/evas/cserve2 \
385-DEFL_EVAS_BUILD \
384@EFL_CFLAGS@ \ 386@EFL_CFLAGS@ \
385@EVAS_CFLAGS@ 387@EVAS_CFLAGS@
386modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la 388modules_evas_engines_software_generic_module_la_LIBADD = @EFL_LIBS@ lib/evas/libevas.la
@@ -411,8 +413,14 @@ modules_evas_engines_buffer_module_la_CPPFLAGS = \
411-I$(top_builddir)/src/lib/evas/include \ 413-I$(top_builddir)/src/lib/evas/include \
412-I$(top_srcdir)/src/lib/evas/cserve2 \ 414-I$(top_srcdir)/src/lib/evas/cserve2 \
413-I$(top_builddir)/src/lib/evas/cserve2 \ 415-I$(top_builddir)/src/lib/evas/cserve2 \
416-DEFL_EVAS_BUILD \
414@EFL_CFLAGS@ \ 417@EFL_CFLAGS@ \
415@EVAS_CFLAGS@ 418@EVAS_CFLAGS@
419if HAVE_WINDOWS
420modules_evas_engines_buffer_module_la_CPPFLAGS += \
421-I$(top_srcdir)/src/lib/evil \
422-I$(top_builddir)/src/lib/evil
423endif
416modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ 424modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@
417modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version 425modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version
418modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static 426modules_evas_engines_buffer_module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -469,6 +477,7 @@ modules_evas_engines_direct3d_module_la_CPPFLAGS = \
469-I$(top_builddir)/src/lib/evas/include \ 477-I$(top_builddir)/src/lib/evas/include \
470-I$(top_srcdir)/src/lib/evas/cserve2 \ 478-I$(top_srcdir)/src/lib/evas/cserve2 \
471-I$(top_builddir)/src/lib/evas/cserve2 \ 479-I$(top_builddir)/src/lib/evas/cserve2 \
480-DEFL_EVAS_BUILD \
472@evas_engine_direct3d_cflags@ \ 481@evas_engine_direct3d_cflags@ \
473@EFL_CFLAGS@ \ 482@EFL_CFLAGS@ \
474@EVAS_CFLAGS@ 483@EVAS_CFLAGS@
@@ -701,6 +710,7 @@ modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \
701-I$(top_builddir)/src/lib/evas/include \ 710-I$(top_builddir)/src/lib/evas/include \
702-I$(top_srcdir)/src/lib/evas/cserve2 \ 711-I$(top_srcdir)/src/lib/evas/cserve2 \
703-I$(top_builddir)/src/lib/evas/cserve2 \ 712-I$(top_builddir)/src/lib/evas/cserve2 \
713-DEFL_EVAS_BUILD \
704@EFL_CFLAGS@ \ 714@EFL_CFLAGS@ \
705@EVAS_CFLAGS@ 715@EVAS_CFLAGS@
706modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \ 716modules_evas_engines_gl_common_libevas_engine_gl_common_la_LIBADD = \
@@ -917,9 +927,15 @@ modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \
917-I$(top_builddir)/src/lib/evas/include \ 927-I$(top_builddir)/src/lib/evas/include \
918-I$(top_srcdir)/src/lib/evas/cserve2 \ 928-I$(top_srcdir)/src/lib/evas/cserve2 \
919-I$(top_builddir)/src/lib/evas/cserve2 \ 929-I$(top_builddir)/src/lib/evas/cserve2 \
930-DEFL_EVAS_BUILD \
920@evas_engine_software_ddraw_cflags@ \ 931@evas_engine_software_ddraw_cflags@ \
921@EFL_CFLAGS@ \ 932@EFL_CFLAGS@ \
922@EVAS_CFLAGS@ 933@EVAS_CFLAGS@
934if HAVE_WINDOWS
935modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \
936-I$(top_srcdir)/src/lib/evil \
937-I$(top_builddir)/src/lib/evil
938endif
923modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions 939modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions
924modules_evas_engines_software_ddraw_module_la_LIBADD = \ 940modules_evas_engines_software_ddraw_module_la_LIBADD = \
925lib/evas/libevas.la \ 941lib/evas/libevas.la \
@@ -957,9 +973,15 @@ modules_evas_engines_software_gdi_module_la_CPPFLAGS = \
957-I$(top_builddir)/src/lib/evas/include \ 973-I$(top_builddir)/src/lib/evas/include \
958-I$(top_srcdir)/src/lib/evas/cserve2 \ 974-I$(top_srcdir)/src/lib/evas/cserve2 \
959-I$(top_builddir)/src/lib/evas/cserve2 \ 975-I$(top_builddir)/src/lib/evas/cserve2 \
976-DEFL_EVAS_BUILD \
960@evas_engine_software_gdi_cflags@ \ 977@evas_engine_software_gdi_cflags@ \
961@EFL_CFLAGS@ \ 978@EFL_CFLAGS@ \
962@EVAS_CFLAGS@ 979@EVAS_CFLAGS@
980if HAVE_WINDOWS
981modules_evas_engines_software_gdi_module_la_CPPFLAGS += \
982-I$(top_srcdir)/src/lib/evil \
983-I$(top_builddir)/src/lib/evil
984endif
963modules_evas_engines_software_gdi_module_la_LIBADD = \ 985modules_evas_engines_software_gdi_module_la_LIBADD = \
964lib/evas/libevas.la \ 986lib/evas/libevas.la \
965@evas_engine_software_gdi_libs@ \ 987@evas_engine_software_gdi_libs@ \
@@ -1133,6 +1155,7 @@ modules_evas_loaders_bmp_module_la_CPPFLAGS = \
1133-I$(top_builddir)/src/lib/evas \ 1155-I$(top_builddir)/src/lib/evas \
1134-I$(top_srcdir)/src/lib/evas/include \ 1156-I$(top_srcdir)/src/lib/evas/include \
1135-I$(top_builddir)/src/lib/evas/include \ 1157-I$(top_builddir)/src/lib/evas/include \
1158-DEFL_EVAS_BUILD \
1136@evas_image_loader_bmp_cflags@ \ 1159@evas_image_loader_bmp_cflags@ \
1137@EFL_CFLAGS@ \ 1160@EFL_CFLAGS@ \
1138@EVAS_CFLAGS@ 1161@EVAS_CFLAGS@
@@ -1166,6 +1189,7 @@ modules_evas_loaders_eet_module_la_CPPFLAGS = \
1166-I$(top_builddir)/src/lib/evas \ 1189-I$(top_builddir)/src/lib/evas \
1167-I$(top_srcdir)/src/lib/evas/include \ 1190-I$(top_srcdir)/src/lib/evas/include \
1168-I$(top_builddir)/src/lib/evas/include \ 1191-I$(top_builddir)/src/lib/evas/include \
1192-DEFL_EVAS_BUILD \
1169@evas_image_loader_eet_cflags@ \ 1193@evas_image_loader_eet_cflags@ \
1170@EFL_CFLAGS@ \ 1194@EFL_CFLAGS@ \
1171@EVAS_CFLAGS@ 1195@EVAS_CFLAGS@
@@ -1196,6 +1220,7 @@ modules_evas_loaders_generic_module_la_CPPFLAGS = \
1196-I$(top_builddir)/src/lib/evas \ 1220-I$(top_builddir)/src/lib/evas \
1197-I$(top_srcdir)/src/lib/evas/include \ 1221-I$(top_srcdir)/src/lib/evas/include \
1198-I$(top_builddir)/src/lib/evas/include \ 1222-I$(top_builddir)/src/lib/evas/include \
1223-DEFL_EVAS_BUILD \
1199@evas_image_loader_generic_cflags@ \ 1224@evas_image_loader_generic_cflags@ \
1200@EFL_CFLAGS@ \ 1225@EFL_CFLAGS@ \
1201@EVAS_CFLAGS@ 1226@EVAS_CFLAGS@
@@ -1226,6 +1251,7 @@ modules_evas_loaders_gif_module_la_CPPFLAGS = \
1226-I$(top_builddir)/src/lib/evas \ 1251-I$(top_builddir)/src/lib/evas \
1227-I$(top_srcdir)/src/lib/evas/include \ 1252-I$(top_srcdir)/src/lib/evas/include \
1228-I$(top_builddir)/src/lib/evas/include \ 1253-I$(top_builddir)/src/lib/evas/include \
1254-DEFL_EVAS_BUILD \
1229@evas_image_loader_gif_cflags@ \ 1255@evas_image_loader_gif_cflags@ \
1230@EFL_CFLAGS@ \ 1256@EFL_CFLAGS@ \
1231@EVAS_CFLAGS@ 1257@EVAS_CFLAGS@
@@ -1256,6 +1282,7 @@ modules_evas_loaders_ico_module_la_CPPFLAGS = \
1256-I$(top_builddir)/src/lib/evas \ 1282-I$(top_builddir)/src/lib/evas \
1257-I$(top_srcdir)/src/lib/evas/include \ 1283-I$(top_srcdir)/src/lib/evas/include \
1258-I$(top_builddir)/src/lib/evas/include \ 1284-I$(top_builddir)/src/lib/evas/include \
1285-DEFL_EVAS_BUILD \
1259@evas_image_loader_ico_cflags@ \ 1286@evas_image_loader_ico_cflags@ \
1260@EFL_CFLAGS@ \ 1287@EFL_CFLAGS@ \
1261@EVAS_CFLAGS@ 1288@EVAS_CFLAGS@
@@ -1289,6 +1316,7 @@ modules_evas_loaders_jpeg_module_la_CPPFLAGS = \
1289-I$(top_builddir)/src/lib/evas \ 1316-I$(top_builddir)/src/lib/evas \
1290-I$(top_srcdir)/src/lib/evas/include \ 1317-I$(top_srcdir)/src/lib/evas/include \
1291-I$(top_builddir)/src/lib/evas/include \ 1318-I$(top_builddir)/src/lib/evas/include \
1319-DEFL_EVAS_BUILD \
1292@evas_image_loader_jpeg_cflags@ \ 1320@evas_image_loader_jpeg_cflags@ \
1293@EFL_CFLAGS@ \ 1321@EFL_CFLAGS@ \
1294@EVAS_CFLAGS@ 1322@EVAS_CFLAGS@
@@ -1342,6 +1370,7 @@ modules_evas_loaders_pmaps_module_la_CPPFLAGS = \
1342-I$(top_builddir)/src/lib/evas \ 1370-I$(top_builddir)/src/lib/evas \
1343-I$(top_srcdir)/src/lib/evas/include \ 1371-I$(top_srcdir)/src/lib/evas/include \
1344-I$(top_builddir)/src/lib/evas/include \ 1372-I$(top_builddir)/src/lib/evas/include \
1373-DEFL_EVAS_BUILD \
1345@evas_image_loader_pmaps_cflags@ \ 1374@evas_image_loader_pmaps_cflags@ \
1346@EFL_CFLAGS@ \ 1375@EFL_CFLAGS@ \
1347@EVAS_CFLAGS@ 1376@EVAS_CFLAGS@
@@ -1372,6 +1401,7 @@ modules_evas_loaders_png_module_la_CPPFLAGS = \
1372-I$(top_builddir)/src/lib/evas \ 1401-I$(top_builddir)/src/lib/evas \
1373-I$(top_srcdir)/src/lib/evas/include \ 1402-I$(top_srcdir)/src/lib/evas/include \
1374-I$(top_builddir)/src/lib/evas/include \ 1403-I$(top_builddir)/src/lib/evas/include \
1404-DEFL_EVAS_BUILD \
1375@evas_image_loader_png_cflags@ \ 1405@evas_image_loader_png_cflags@ \
1376@EFL_CFLAGS@ \ 1406@EFL_CFLAGS@ \
1377@EVAS_CFLAGS@ 1407@EVAS_CFLAGS@
@@ -1394,6 +1424,7 @@ modules_evas_savers_png_module_la_CPPFLAGS = \
1394-I$(top_builddir)/src/lib/evas \ 1424-I$(top_builddir)/src/lib/evas \
1395-I$(top_srcdir)/src/lib/evas/include \ 1425-I$(top_srcdir)/src/lib/evas/include \
1396-I$(top_builddir)/src/lib/evas/include \ 1426-I$(top_builddir)/src/lib/evas/include \
1427-DEFL_EVAS_BUILD \
1397@evas_image_loader_png_cflags@ \ 1428@evas_image_loader_png_cflags@ \
1398@EFL_CFLAGS@ \ 1429@EFL_CFLAGS@ \
1399@EVAS_CFLAGS@ 1430@EVAS_CFLAGS@
@@ -1424,6 +1455,7 @@ modules_evas_loaders_psd_module_la_CPPFLAGS = \
1424-I$(top_builddir)/src/lib/evas \ 1455-I$(top_builddir)/src/lib/evas \
1425-I$(top_srcdir)/src/lib/evas/include \ 1456-I$(top_srcdir)/src/lib/evas/include \
1426-I$(top_builddir)/src/lib/evas/include \ 1457-I$(top_builddir)/src/lib/evas/include \
1458-DEFL_EVAS_BUILD \
1427@evas_image_loader_psd_cflags@ \ 1459@evas_image_loader_psd_cflags@ \
1428@EFL_CFLAGS@ \ 1460@EFL_CFLAGS@ \
1429@EVAS_CFLAGS@ 1461@EVAS_CFLAGS@
@@ -1454,6 +1486,7 @@ modules_evas_loaders_svg_module_la_CPPFLAGS = \
1454-I$(top_builddir)/src/lib/evas \ 1486-I$(top_builddir)/src/lib/evas \
1455-I$(top_srcdir)/src/lib/evas/include \ 1487-I$(top_srcdir)/src/lib/evas/include \
1456-I$(top_builddir)/src/lib/evas/include \ 1488-I$(top_builddir)/src/lib/evas/include \
1489-DEFL_EVAS_BUILD \
1457@evas_image_loader_svg_cflags@ \ 1490@evas_image_loader_svg_cflags@ \
1458@EFL_CFLAGS@ \ 1491@EFL_CFLAGS@ \
1459@EVAS_CFLAGS@ 1492@EVAS_CFLAGS@
@@ -1484,6 +1517,7 @@ modules_evas_loaders_tga_module_la_CPPFLAGS = \
1484-I$(top_builddir)/src/lib/evas \ 1517-I$(top_builddir)/src/lib/evas \
1485-I$(top_srcdir)/src/lib/evas/include \ 1518-I$(top_srcdir)/src/lib/evas/include \
1486-I$(top_builddir)/src/lib/evas/include \ 1519-I$(top_builddir)/src/lib/evas/include \
1520-DEFL_EVAS_BUILD \
1487@evas_image_loader_tga_cflags@ \ 1521@evas_image_loader_tga_cflags@ \
1488@EFL_CFLAGS@ \ 1522@EFL_CFLAGS@ \
1489@EVAS_CFLAGS@ 1523@EVAS_CFLAGS@
@@ -1514,9 +1548,15 @@ modules_evas_loaders_tiff_module_la_CPPFLAGS = \
1514-I$(top_builddir)/src/lib/evas \ 1548-I$(top_builddir)/src/lib/evas \
1515-I$(top_srcdir)/src/lib/evas/include \ 1549-I$(top_srcdir)/src/lib/evas/include \
1516-I$(top_builddir)/src/lib/evas/include \ 1550-I$(top_builddir)/src/lib/evas/include \
1551-DEFL_EVAS_BUILD \
1517@evas_image_loader_tiff_cflags@ \ 1552@evas_image_loader_tiff_cflags@ \
1518@EFL_CFLAGS@ \ 1553@EFL_CFLAGS@ \
1519@EVAS_CFLAGS@ 1554@EVAS_CFLAGS@
1555if HAVE_WINDOWS
1556modules_evas_loaders_tiff_module_la_CPPFLAGS += \
1557-I$(top_srcdir)/src/lib/evil \
1558-I$(top_builddir)/src/lib/evil
1559endif
1520modules_evas_loaders_tiff_module_la_LIBADD = \ 1560modules_evas_loaders_tiff_module_la_LIBADD = \
1521lib/evas/libevas.la \ 1561lib/evas/libevas.la \
1522@EFL_LIBS@ \ 1562@EFL_LIBS@ \
@@ -1536,9 +1576,15 @@ modules_evas_savers_tiff_module_la_CPPFLAGS = \
1536-I$(top_builddir)/src/lib/evas \ 1576-I$(top_builddir)/src/lib/evas \
1537-I$(top_srcdir)/src/lib/evas/include \ 1577-I$(top_srcdir)/src/lib/evas/include \
1538-I$(top_builddir)/src/lib/evas/include \ 1578-I$(top_builddir)/src/lib/evas/include \
1579-DEFL_EVAS_BUILD \
1539@evas_image_loader_tiff_cflags@ \ 1580@evas_image_loader_tiff_cflags@ \
1540@EFL_CFLAGS@ \ 1581@EFL_CFLAGS@ \
1541@EVAS_CFLAGS@ 1582@EVAS_CFLAGS@
1583if HAVE_WINDOWS
1584modules_evas_savers_tiff_module_la_CPPFLAGS += \
1585-I$(top_srcdir)/src/lib/evil \
1586-I$(top_builddir)/src/lib/evil
1587endif
1542modules_evas_savers_tiff_module_la_LIBADD = \ 1588modules_evas_savers_tiff_module_la_LIBADD = \
1543lib/evas/libevas.la \ 1589lib/evas/libevas.la \
1544@EFL_LIBS@ \ 1590@EFL_LIBS@ \
@@ -1566,6 +1612,7 @@ modules_evas_loaders_wbmp_module_la_CPPFLAGS = \
1566-I$(top_builddir)/src/lib/evas \ 1612-I$(top_builddir)/src/lib/evas \
1567-I$(top_srcdir)/src/lib/evas/include \ 1613-I$(top_srcdir)/src/lib/evas/include \
1568-I$(top_builddir)/src/lib/evas/include \ 1614-I$(top_builddir)/src/lib/evas/include \
1615-DEFL_EVAS_BUILD \
1569@evas_image_loader_wbmp_cflags@ \ 1616@evas_image_loader_wbmp_cflags@ \
1570@EFL_CFLAGS@ \ 1617@EFL_CFLAGS@ \
1571@EVAS_CFLAGS@ 1618@EVAS_CFLAGS@
@@ -1596,6 +1643,7 @@ modules_evas_loaders_webp_module_la_CPPFLAGS = \
1596-I$(top_builddir)/src/lib/evas \ 1643-I$(top_builddir)/src/lib/evas \
1597-I$(top_srcdir)/src/lib/evas/include \ 1644-I$(top_srcdir)/src/lib/evas/include \
1598-I$(top_builddir)/src/lib/evas/include \ 1645-I$(top_builddir)/src/lib/evas/include \
1646-DEFL_EVAS_BUILD \
1599@evas_image_loader_webp_cflags@ \ 1647@evas_image_loader_webp_cflags@ \
1600@EFL_CFLAGS@ \ 1648@EFL_CFLAGS@ \
1601@EVAS_CFLAGS@ 1649@EVAS_CFLAGS@
@@ -1626,6 +1674,7 @@ modules_evas_loaders_xpm_module_la_CPPFLAGS = \
1626-I$(top_builddir)/src/lib/evas \ 1674-I$(top_builddir)/src/lib/evas \
1627-I$(top_srcdir)/src/lib/evas/include \ 1675-I$(top_srcdir)/src/lib/evas/include \
1628-I$(top_builddir)/src/lib/evas/include \ 1676-I$(top_builddir)/src/lib/evas/include \
1677-DEFL_EVAS_BUILD \
1629@evas_image_loader_xpm_cflags@ \ 1678@evas_image_loader_xpm_cflags@ \
1630@EFL_CFLAGS@ \ 1679@EFL_CFLAGS@ \
1631@EVAS_CFLAGS@ 1680@EVAS_CFLAGS@
@@ -1638,7 +1687,9 @@ modules_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
1638endif 1687endif
1639endif 1688endif
1640 1689
1641### binary 1690### binary (cserve2)
1691
1692if EVAS_CSERVE2
1642 1693
1643libexec_PROGRAMS = \ 1694libexec_PROGRAMS = \
1644bin/evas/evas_cserve2 \ 1695bin/evas/evas_cserve2 \
@@ -2103,3 +2154,5 @@ bin_evas_loaders_xpm_module_la_LIBADD = @EFL_LIBS@ @evas_image_loader_xpm_libs@
2103bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version 2154bin_evas_loaders_xpm_module_la_LDFLAGS = -no-undefined -module -avoid-version
2104bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static 2155bin_evas_loaders_xpm_module_la_LIBTOOLFLAGS = --tag=disable-static
2105endif 2156endif
2157
2158endif
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index cd5797ddd3..4eb8b56616 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -104,9 +104,9 @@ lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
104lib_evil_libevil_la_LDFLAGS = -no-undefined -version-info @version_info@ 104lib_evil_libevil_la_LDFLAGS = -no-undefined -version-info @version_info@
105 105
106if HAVE_WINCE 106if HAVE_WINCE
107lib_evil_libevil_la_LINK = $(LINK) $(libevil_la_LDFLAGS) 107lib_evil_libevil_la_LINK = $(LINK) $(lib_evil_libevil_la_LDFLAGS)
108else 108else
109lib_evil_libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS) 109lib_evil_libevil_la_LINK = $(CXXLINK) $(lib_evil_libevil_la_LDFLAGS)
110endif 110endif
111 111
112lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c 112lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
@@ -118,7 +118,7 @@ lib_evil_libdl_la_CPPFLAGS = \
118 118
119lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@ 119lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@
120 120
121lib_evil_libdl_la_LIBADD = $(top_builddir)/src/lib/evil/libevil.la @EVIL_DLFCN_LIBS@ 121lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@
122 122
123lib_evil_libdl_la_LDFLAGS = -no-undefined -version-info @version_info@ 123lib_evil_libdl_la_LDFLAGS = -no-undefined -version-info @version_info@
124 124
@@ -172,7 +172,7 @@ endif
172 172
173bin_evil_evil_suite_LDADD = \ 173bin_evil_evil_suite_LDADD = \
174lib/evil/libevil.la \ 174lib/evil/libevil.la \
175lib/eina/libdl.la \ 175lib/evil/libdl.la \
176-lm 176-lm
177 177
178bin_evil_test_evil_SOURCES = bin/evil/test_evil.c 178bin_evil_test_evil_SOURCES = bin/evil/test_evil.c