summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-03-15 23:46:52 +0100
committerCedric Bail <cedric.bail@free.fr>2013-03-16 16:33:57 +0900
commit6fdaef02593094cea3fa51f048534a6cca01af19 (patch)
treeea2ba86b0429174300c7464b647155a708c7b420 /src
parentba4db2c2416134af5556a4c8b797c4d5c9db551f (diff)
efl: fix compilation on Windows when no Evil library is installed.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_EDBus.am5
-rw-r--r--src/Makefile_Edje.am24
-rw-r--r--src/Makefile_Eet.am4
-rw-r--r--src/Makefile_Efreet.am12
-rw-r--r--src/Makefile_Embryo.am4
-rw-r--r--src/Makefile_Ethumb.am4
-rw-r--r--src/Makefile_Ethumb_Client.am12
7 files changed, 50 insertions, 15 deletions
diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am
index b47a40cd36..6f5dbd49e1 100644
--- a/src/Makefile_EDBus.am
+++ b/src/Makefile_EDBus.am
@@ -56,7 +56,12 @@ bin_edbus_edbus_codegen_CPPFLAGS = \
56-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 56-DPACKAGE_LIB_DIR=\"$(libdir)\" \
57-DPACKAGE_DATA_DIR=\"$(datadir)/edbus\" \ 57-DPACKAGE_DATA_DIR=\"$(datadir)/edbus\" \
58@EDBUS_CFLAGS@ 58@EDBUS_CFLAGS@
59
60if HAVE_WIN32
61bin_edbus_edbus_codegen_LDADD = -L$(top_builddir)/src/lib/evil @USE_EDBUS_LIBS@
62else
59bin_edbus_edbus_codegen_LDADD = @USE_EDBUS_LIBS@ 63bin_edbus_edbus_codegen_LDADD = @USE_EDBUS_LIBS@
64endif
60bin_edbus_edbus_codegen_DEPENDENCIES = @USE_EDBUS_INTERNAL_LIBS@ 65bin_edbus_edbus_codegen_DEPENDENCIES = @USE_EDBUS_INTERNAL_LIBS@
61 66
62### Unit tests 67### Unit tests
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 0c71e4bb00..50837de8ea 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -82,6 +82,12 @@ endif
82 82
83### Binary 83### Binary
84 84
85if HAVE_WIN32
86USE_EDJE_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_EDJE_LIBS@
87else
88USE_EDJE_BIN_LIBS = @USE_EDJE_LIBS@
89endif
90
85bin_PROGRAMS += \ 91bin_PROGRAMS += \
86bin/edje/edje_cc \ 92bin/edje/edje_cc \
87bin/edje/edje_decc \ 93bin/edje/edje_decc \
@@ -103,7 +109,7 @@ bin/edje/edje_cc_handlers.c \
103bin/edje/edje_cc_sources.c \ 109bin/edje/edje_cc_sources.c \
104bin/edje/edje_multisense_convert.c 110bin/edje/edje_multisense_convert.c
105bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 111bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
106bin_edje_edje_cc_LDADD = @USE_EDJE_LIBS@ 112bin_edje_edje_cc_LDADD = $(USE_EDJE_BIN_LIBS)
107bin_edje_edje_cc_DEPENDENCIES = \ 113bin_edje_edje_cc_DEPENDENCIES = \
108@USE_EDJE_INTERNAL_LIBS@ \ 114@USE_EDJE_INTERNAL_LIBS@ \
109bin/edje/epp/epp # epp is an artificial dependency because edje_cc will use it at runtime, so we be sure if we depend on edje_cc we get epp. 115bin/edje/epp/epp # epp is an artificial dependency because edje_cc will use it at runtime, so we be sure if we depend on edje_cc we get epp.
@@ -114,37 +120,37 @@ bin/edje/edje_decc.h \
114bin/edje/edje_cc_mem.c \ 120bin/edje/edje_cc_mem.c \
115bin/edje/edje_cc_sources.c 121bin/edje/edje_cc_sources.c
116bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 122bin_edje_edje_decc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
117bin_edje_edje_decc_LDADD = @USE_EDJE_LIBS@ 123bin_edje_edje_decc_LDADD = $(USE_EDJE_BIN_LIBS)
118bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 124bin_edje_edje_decc_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
119 125
120bin_edje_edje_player_SOURCES = bin/edje/edje_player.c 126bin_edje_edje_player_SOURCES = bin/edje/edje_player.c
121bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 127bin_edje_edje_player_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
122bin_edje_edje_player_LDADD = @USE_EDJE_LIBS@ 128bin_edje_edje_player_LDADD = $(USE_EDJE_BIN_LIBS)
123bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 129bin_edje_edje_player_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
124 130
125bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c 131bin_edje_edje_inspector_SOURCES = bin/edje/edje_inspector.c
126bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 132bin_edje_edje_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
127bin_edje_edje_inspector_LDADD = @USE_EDJE_LIBS@ 133bin_edje_edje_inspector_LDADD = $(USE_EDJE_BIN_LIBS)
128bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 134bin_edje_edje_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
129 135
130bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c 136bin_edje_edje_external_inspector_SOURCES = bin/edje/edje_external_inspector.c
131bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 137bin_edje_edje_external_inspector_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
132bin_edje_edje_external_inspector_LDADD = @USE_EDJE_LIBS@ 138bin_edje_edje_external_inspector_LDADD = $(USE_EDJE_BIN_LIBS)
133bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 139bin_edje_edje_external_inspector_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
134 140
135bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c 141bin_edje_edje_codegen_SOURCES = bin/edje/edje_codegen.c
136bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 142bin_edje_edje_codegen_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
137bin_edje_edje_codegen_LDADD = @USE_EDJE_LIBS@ 143bin_edje_edje_codegen_LDADD = $(USE_EDJE_BIN_LIBS)
138bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 144bin_edje_edje_codegen_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
139 145
140bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c 146bin_edje_edje_pick_SOURCES = bin/edje/edje_pick.c
141bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 147bin_edje_edje_pick_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
142bin_edje_edje_pick_LDADD = @USE_EDJE_LIBS@ 148bin_edje_edje_pick_LDADD = $(USE_EDJE_BIN_LIBS)
143bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 149bin_edje_edje_pick_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
144 150
145bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c 151bin_edje_edje_watch_SOURCES = bin/edje/edje_watch.c
146bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS) 152bin_edje_edje_watch_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
147bin_edje_edje_watch_LDADD = @USE_EDJE_LIBS@ 153bin_edje_edje_watch_LDADD = $(USE_EDJE_BIN_LIBS)
148bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 154bin_edje_edje_watch_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
149 155
150# EPP (Edje's CPP) 156# EPP (Edje's CPP)
@@ -226,7 +232,7 @@ tests_edje_edje_suite_CPPFLAGS = \
226$(EDJE_COMMON_CPPFLAGS) \ 232$(EDJE_COMMON_CPPFLAGS) \
227-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \ 233-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje\" \
228@CHECK_CFLAGS@ 234@CHECK_CFLAGS@
229tests_edje_edje_suite_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@ 235tests_edje_edje_suite_LDADD = @CHECK_LIBS@ $(USE_EDJE_BIN_LIBS)
230tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ 236tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
231 237
232tests/edje/data/test_layout.edj: tests/edje/data/test_layout.edc bin/edje/edje_cc 238tests/edje/data/test_layout.edj: tests/edje/data/test_layout.edc bin/edje/edje_cc
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 8f0ebf2892..1640299318 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -46,7 +46,11 @@ bin_eet_eet_CPPFLAGS = \
46-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ 46-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
47@EET_CFLAGS@ 47@EET_CFLAGS@
48 48
49if HAVE_WIN32
50bin_eet_eet_LDADD = -L$(top_builddir)/src/lib/evil @USE_EET_LIBS@
51else
49bin_eet_eet_LDADD = @USE_EET_LIBS@ 52bin_eet_eet_LDADD = @USE_EET_LIBS@
53endif
50bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@ 54bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
51 55
52### Unit tests 56### Unit tests
diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am
index 0cbdca902a..e608a46da4 100644
--- a/src/Makefile_Efreet.am
+++ b/src/Makefile_Efreet.am
@@ -67,6 +67,12 @@ lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
67 67
68### Binary 68### Binary
69 69
70if HAVE_WIN32
71USE_EFREET_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_EFREET_LIBS@
72else
73USE_EFREET_BIN_LIBS = @USE_EFREET_LIBS@
74endif
75
70bin_PROGRAMS += bin/efreet/efreetd 76bin_PROGRAMS += bin/efreet/efreetd
71 77
72bin_efreet_efreetd_SOURCES = \ 78bin_efreet_efreetd_SOURCES = \
@@ -78,7 +84,7 @@ bin/efreet/efreetd_cache.h \
78bin/efreet/efreetd_cache.c 84bin/efreet/efreetd_cache.c
79 85
80bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 86bin_efreet_efreetd_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
81bin_efreet_efreetd_LDADD = @USE_EFREET_LIBS@ 87bin_efreet_efreetd_LDADD = $(USE_EFREET_BIN_LIBS)
82bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 88bin_efreet_efreetd_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
83 89
84efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH) 90efreetinternal_bindir=$(libdir)/efreet/$(MODULE_ARCH)
@@ -87,12 +93,12 @@ bin/efreet/efreet_desktop_cache_create \
87bin/efreet/efreet_icon_cache_create 93bin/efreet/efreet_icon_cache_create
88 94
89bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 95bin_efreet_efreet_desktop_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
90bin_efreet_efreet_desktop_cache_create_LDADD = @USE_EFREET_LIBS@ 96bin_efreet_efreet_desktop_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
91bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 97bin_efreet_efreet_desktop_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
92bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c 98bin_efreet_efreet_desktop_cache_create_SOURCES = bin/efreet/efreet_desktop_cache_create.c
93 99
94bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) 100bin_efreet_efreet_icon_cache_create_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS)
95bin_efreet_efreet_icon_cache_create_LDADD = @USE_EFREET_LIBS@ 101bin_efreet_efreet_icon_cache_create_LDADD = $(USE_EFREET_BIN_LIBS)
96bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@ 102bin_efreet_efreet_icon_cache_create_DEPENDENCIES = @USE_EFREET_INTERNAL_LIBS@
97bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c 103bin_efreet_efreet_icon_cache_create_SOURCES = bin/efreet/efreet_icon_cache_create.c
98 104
diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index 47bc04b0ad..907f328bf6 100644
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -53,7 +53,11 @@ bin_embryo_embryo_cc_CPPFLAGS = \
53-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ 53-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
54@EMBRYO_CFLAGS@ 54@EMBRYO_CFLAGS@
55 55
56if HAVE_WIN32
57bin_embryo_embryo_cc_LDADD = -L$(top_builddir)/src/lib/evil @USE_EMBRYO_LIBS@
58else
56bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@ 59bin_embryo_embryo_cc_LDADD = @USE_EMBRYO_LIBS@
60endif
57bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@ 61bin_embryo_embryo_cc_DEPENDENCIES = @USE_EMBRYO_INTERNAL_LIBS@
58 62
59EXTRA_DIST += \ 63EXTRA_DIST += \
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index c2aa2d3751..453be295c3 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -66,5 +66,9 @@ bin/ethumb/ethumb
66 66
67bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c 67bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
68bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@ 68bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
69if HAVE_WIN32
70bin_ethumb_ethumb_LDADD = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_LIBS@
71else
69bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@ 72bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
73endif
70bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@ 74bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
diff --git a/src/Makefile_Ethumb_Client.am b/src/Makefile_Ethumb_Client.am
index e8afe297f9..41900c22c6 100644
--- a/src/Makefile_Ethumb_Client.am
+++ b/src/Makefile_Ethumb_Client.am
@@ -17,6 +17,12 @@ lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
17 17
18### Binary 18### Binary
19 19
20if HAVE_WIN32
21USE_ETHUMB_CLIENT_BIN_LIBS = -L$(top_builddir)/src/lib/evil @USE_ETHUMB_CLIENT_LIBS@
22else
23USE_ETHUMB_CLIENT_BIN_LIBS = @USE_ETHUMB_CLIENT_LIBS@
24endif
25
20bin_PROGRAMS += \ 26bin_PROGRAMS += \
21bin/ethumb_client/ethumbd \ 27bin/ethumb_client/ethumbd \
22bin/ethumb_client/ethumbd_client 28bin/ethumb_client/ethumbd_client
@@ -34,12 +40,12 @@ bin_ethumb_client_ethumbd_CPPFLAGS = \
34-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \ 40-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
35-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \ 41-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
36@ETHUMB_CLIENT_CFLAGS@ 42@ETHUMB_CLIENT_CFLAGS@
37bin_ethumb_client_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@ 43bin_ethumb_client_ethumbd_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
38bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ 44bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
39 45
40bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c 46bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c
41bin_ethumb_client_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@ 47bin_ethumb_client_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
42bin_ethumb_client_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@ 48bin_ethumb_client_ethumbd_client_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
43bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@ 49bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
44 50
45# slave does not use dbus, it's a simple ethumb application 51# slave does not use dbus, it's a simple ethumb application
@@ -47,5 +53,5 @@ bin_ethumb_client_ethumbd_slave_SOURCES = \
47bin/ethumb_client/ethumbd_private.h \ 53bin/ethumb_client/ethumbd_private.h \
48bin/ethumb_client/ethumbd_slave.c 54bin/ethumb_client/ethumbd_slave.c
49bin_ethumb_client_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@ 55bin_ethumb_client_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
50bin_ethumb_client_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@ 56bin_ethumb_client_ethumbd_slave_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
51bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@ 57bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@