summaryrefslogtreecommitdiff
path: root/src
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
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')
-rw-r--r--src/Makefile_Ecore.am15
-rw-r--r--src/Makefile_Ecore_Con.am15
-rw-r--r--src/Makefile_Ecore_Evas.am8
-rw-r--r--src/Makefile_Eet.am40
-rw-r--r--src/Makefile_Eina.am18
-rw-r--r--src/Makefile_Embryo.am34
-rw-r--r--src/Makefile_Eo.am8
-rw-r--r--src/Makefile_Evas.am43
-rw-r--r--src/Makefile_Evil.am5
9 files changed, 49 insertions, 137 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 2efb6edf5f..cffe35faf1 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -55,12 +55,8 @@ lib_ecore_libecore_la_CPPFLAGS = \
55-DEFL_ECORE_BUILD \ 55-DEFL_ECORE_BUILD \
56@EFL_CFLAGS@ \ 56@EFL_CFLAGS@ \
57@EFL_COV_CFLAGS@ \ 57@EFL_COV_CFLAGS@ \
58@ECORE_CFLAGS@ 58@ECORE_CFLAGS@ \
59 59@USE_EVIL_CFLAGS@
60if HAVE_WINDOWS
61lib_ecore_libecore_la_CPPFLAGS += \
62-I$(top_srcdir)/src/lib/evil
63endif
64 60
65if HAVE_PS3 61if HAVE_PS3
66lib_ecore_libecore_la_CPPFLAGS += \ 62lib_ecore_libecore_la_CPPFLAGS += \
@@ -69,11 +65,8 @@ endif
69 65
70lib_ecore_libecore_la_LIBADD = \ 66lib_ecore_libecore_la_LIBADD = \
71lib/eo/libeo.la \ 67lib/eo/libeo.la \
72lib/eina/libeina.la 68lib/eina/libeina.la \
73 69@USE_EVIL_LIBS@
74if HAVE_WINDOWS
75lib_ecore_libecore_la_LIBADD += lib/evil/libevil.la
76endif
77 70
78if HAVE_PS3 71if HAVE_PS3
79lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la 72lib_ecore_libecore_la_LIBADD += lib/escape/libescape.la
diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am
index 5ef183c269..df18c90f9f 100644
--- a/src/Makefile_Ecore_Con.am
+++ b/src/Makefile_Ecore_Con.am
@@ -43,22 +43,15 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \
43-DEFL_ECORE_CON_BUILD \ 43-DEFL_ECORE_CON_BUILD \
44@EFL_CFLAGS@ \ 44@EFL_CFLAGS@ \
45@EFL_COV_CFLAGS@ \ 45@EFL_COV_CFLAGS@ \
46@ECORE_CON_CFLAGS@ 46@ECORE_CON_CFLAGS@ \
47 47@USE_EVIL_CFLAGS@
48if HAVE_WINDOWS
49lib_ecore_con_libecore_con_la_CPPFLAGS += \
50-I$(top_srcdir)/src/lib/evil
51endif
52 48
53lib_ecore_con_libecore_con_la_LIBADD = \ 49lib_ecore_con_libecore_con_la_LIBADD = \
54lib/ecore/libecore.la \ 50lib/ecore/libecore.la \
55lib/eet/libeet.la \ 51lib/eet/libeet.la \
56lib/eo/libeo.la \ 52lib/eo/libeo.la \
57lib/eina/libeina.la 53lib/eina/libeina.la \
58 54@USE_EVIL_LIBS@
59if HAVE_WINDOWS
60lib_ecore_con_libecore_con_la_LIBADD += lib/evil/libevil.la
61endif
62 55
63lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm 56lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ -lm
64 57
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 79faae64c8..0e0aabb6c0 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -30,12 +30,8 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \
30-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 30-DPACKAGE_LIB_DIR=\"$(libdir)\" \
31-DEFL_ECORE_EVAS_BUILD \ 31-DEFL_ECORE_EVAS_BUILD \
32@EFL_CFLAGS@ \ 32@EFL_CFLAGS@ \
33@EFL_COV_CFLAGS@ 33@EFL_COV_CFLAGS@ \
34 34@USE_EVIL_CFLAGS@
35if HAVE_WINDOWS
36lib_ecore_evas_libecore_evas_la_CPPFLAGS += \
37-I$(top_srcdir)/src/lib/evil
38endif
39 35
40lib_ecore_evas_libecore_evas_la_LIBADD = \ 36lib_ecore_evas_libecore_evas_la_LIBADD = \
41lib/ecore_input/libecore_input_evas.la \ 37lib/ecore_input/libecore_input_evas.la \
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 4377c87461..7c7e8beca5 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -33,20 +33,15 @@ lib_eet_libeet_la_CPPFLAGS = \
33-DEFL_EET_BUILD \ 33-DEFL_EET_BUILD \
34@EFL_CFLAGS@ \ 34@EFL_CFLAGS@ \
35@EFL_COV_CFLAGS@ \ 35@EFL_COV_CFLAGS@ \
36@EET_CFLAGS@ 36@EET_CFLAGS@ \
37 37@USE_EVIL_CFLAGS@
38if HAVE_WINDOWS
39lib_eet_libeet_la_CPPFLAGS += \
40-I$(top_srcdir)/src/lib/evil
41endif
42
43lib_eet_libeet_la_LIBADD = lib/eina/libeina.la
44 38
45if HAVE_WINDOWS 39lib_eet_libeet_la_LIBADD = \
46lib_eet_libeet_la_LIBADD += lib/evil/libevil.la 40lib/eina/libeina.la \
47endif 41@USE_EVIL_LIBS@ \
48 42@EET_LIBS@ \
49lib_eet_libeet_la_LIBADD += @EET_LIBS@ @EFL_COV_LIBS@ -lm 43@EFL_COV_LIBS@ \
44-lm
50 45
51lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 46lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
52 47
@@ -67,22 +62,15 @@ bin_eet_eet_CPPFLAGS = \
67-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 62-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
68@EFL_CFLAGS@ \ 63@EFL_CFLAGS@ \
69@EFL_COV_CFLAGS@ \ 64@EFL_COV_CFLAGS@ \
70@EET_CFLAGS@ 65@EET_CFLAGS@ \
71 66@USE_EVIL_CFLAGS@
72if HAVE_WINDOWS
73bin_eet_eet_CPPFLAGS += \
74-I$(top_srcdir)/src/lib/evil
75endif
76 67
77bin_eet_eet_LDADD = \ 68bin_eet_eet_LDADD = \
78lib/eet/libeet.la \ 69lib/eet/libeet.la \
79lib/eina/libeina.la 70lib/eina/libeina.la \
80 71@USE_EVIL_LIBS@ \
81if HAVE_WINDOWS 72@EET_LIBS@ \
82bin_eet_eet_LDADD += lib/evil/libevil.la 73@EFL_COV_LIBS@
83endif
84
85bin_eet_eet_LDADD += @EET_LIBS@ @EFL_COV_LIBS@
86 74
87### Unit tests 75### Unit tests
88 76
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index b7acbe9b11..931876e8d1 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -212,22 +212,10 @@ lib_eina_libeina_la_CPPFLAGS = \
212@EFL_CFLAGS@ \ 212@EFL_CFLAGS@ \
213@EFL_COV_CFLAGS@ \ 213@EFL_COV_CFLAGS@ \
214@EFL_PTHREAD_CFLAGS@ \ 214@EFL_PTHREAD_CFLAGS@ \
215@EINA_CFLAGS@ 215@EINA_CFLAGS@ \
216 216@USE_EVIL_CFLAGS@
217if HAVE_WINDOWS
218lib_eina_libeina_la_CPPFLAGS += \
219-I$(top_srcdir)/src/lib/evil
220endif
221
222lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@
223
224if HAVE_WINDOWS
225lib_eina_libeina_la_LIBADD += \
226lib/evil/libevil.la \
227lib/evil/libdl.la
228endif
229 217
230lib_eina_libeina_la_LIBADD += -lm 218lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ -lm
231 219
232lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ 220lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
233 221
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 7d8e9ec42a..66acb32719 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -23,20 +23,10 @@ lib_embryo_libembryo_la_CPPFLAGS = \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 24-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
25-DEFL_EMBRYO_BUILD \ 25-DEFL_EMBRYO_BUILD \
26@EFL_CFLAGS@ 26@EFL_CFLAGS@ \
27@USE_EVIL_CFLAGS@
27 28
28if HAVE_WINDOWS 29lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la @USE_EVIL_LIBS@ -lm
29lib_embryo_libembryo_la_CPPFLAGS += \
30-I$(top_srcdir)/src/lib/evil
31endif
32
33lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la
34
35if HAVE_WINDOWS
36lib_embryo_libembryo_la_LIBADD += lib/evil/libevil.la
37endif
38
39lib_embryo_libembryo_la_LIBADD += -lm
40 30
41lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ 31lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
42 32
@@ -67,22 +57,14 @@ bin_embryo_embryo_cc_CPPFLAGS = \
67-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 57-DPACKAGE_BIN_DIR=\"$(bindir)\" \
68-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 58-DPACKAGE_LIB_DIR=\"$(libdir)\" \
69-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ 59-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
70@EFL_CFLAGS@ 60@EFL_CFLAGS@ \
71 61@USE_EVIL_CFLAGS@
72if HAVE_WINDOWS
73bin_embryo_embryo_cc_CPPFLAGS += \
74-I$(top_srcdir)/src/lib/evil
75endif
76 62
77bin_embryo_embryo_cc_LDADD = \ 63bin_embryo_embryo_cc_LDADD = \
78lib/embryo/libembryo.la \ 64lib/embryo/libembryo.la \
79lib/eina/libeina.la 65lib/eina/libeina.la \
80 66@USE_EVIL_LIBS@ \
81if HAVE_WINDOWS 67-lm
82bin_embryo_embryo_cc_LDADD += lib/evil/libevil.la
83endif
84
85bin_embryo_embryo_cc_LDADD += -lm
86 68
87EXTRA_DIST += \ 69EXTRA_DIST += \
88bin/embryo/embryo_cc_sc5.scp \ 70bin/embryo/embryo_cc_sc5.scp \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 0d1bb77f8a..54fef7e624 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -19,12 +19,8 @@ lib_eo_libeo_la_CPPFLAGS = \
19-DEFL_EO_BUILD \ 19-DEFL_EO_BUILD \
20@EFL_CFLAGS@ \ 20@EFL_CFLAGS@ \
21@EFL_COV_CFLAGS@ \ 21@EFL_COV_CFLAGS@ \
22@EO_CFLAGS@ 22@EO_CFLAGS@ \
23 23@USE_EVIL_CFLAGS@
24if HAVE_WINDOWS
25lib_eo_libeo_la_CPPFLAGS += \
26-I$(top_srcdir)/src/lib/evil
27endif
28 24
29lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ 25lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@
30 26
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@ \
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index bd4e53cfb6..a9c4d54cfb 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -161,11 +161,6 @@ bin_evil_evil_suite_CPPFLAGS = \
161@EFL_CFLAGS@ \ 161@EFL_CFLAGS@ \
162@EVIL_CPPFLAGS@ 162@EVIL_CPPFLAGS@
163 163
164if HAVE_WINDOWS
165bin_evil_evil_suite_CPPFLAGS += \
166-I$(top_srcdir)/src/lib/evil
167endif
168
169bin_evil_evil_suite_LDADD = \ 164bin_evil_evil_suite_LDADD = \
170lib/evil/libevil.la \ 165lib/evil/libevil.la \
171lib/evil/libdl.la \ 166lib/evil/libdl.la \