summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-12 22:56:05 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-12 22:56:05 +0900
commitea51427622db93242f36780ee90b1e02ebc4f666 (patch)
tree87f09ff0f27eb8d18c68b2b29f5bbf9a933f35ff /src/bin
parent4d5c3baaf16b6cad87a72de33828aa054cd447fe (diff)
option build deps that efl guarantees... now just are assumed and not ifdef'd
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/Makefile.am27
1 files changed, 2 insertions, 25 deletions
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 4240d6d76..46f35f0de 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -16,19 +16,12 @@ AM_CPPFLAGS = \
16@ELEMENTARY_SDL_CFLAGS@ \ 16@ELEMENTARY_SDL_CFLAGS@ \
17@ELEMENTARY_WIN32_CFLAGS@ \ 17@ELEMENTARY_WIN32_CFLAGS@ \
18@ELEMENTARY_WINCE_CFLAGS@ \ 18@ELEMENTARY_WINCE_CFLAGS@ \
19@ELEMENTARY_ELDBUS_CFLAGS@ \
20@ELEMENTARY_EFREET_CFLAGS@ \
21@ELEMENTARY_ELOCATION_CFLAGS@ \ 19@ELEMENTARY_ELOCATION_CFLAGS@ \
22@ELEMENTARY_EWEATHER_CFLAGS@ \ 20@ELEMENTARY_EWEATHER_CFLAGS@ \
23@ELEMENTARY_ETHUMB_CFLAGS@ \
24@ELEMENTARY_WEB_CFLAGS@ \ 21@ELEMENTARY_WEB_CFLAGS@ \
25@ELEMENTARY_EMAP_CFLAGS@ \ 22@ELEMENTARY_EMAP_CFLAGS@ \
26@ELEMENTARY_ECORE_CON_CFLAGS@ \
27@ELEMENTARY_ECORE_IMF_CFLAGS@ \
28@ELEMENTARY_WAYLAND_CFLAGS@ \ 23@ELEMENTARY_WAYLAND_CFLAGS@ \
29@EVIL_CFLAGS@ \ 24@EVIL_CFLAGS@
30@EIO_CFLAGS@ \
31@EMOTION_CFLAGS@
32 25
33bin_PROGRAMS = \ 26bin_PROGRAMS = \
34@ELEMENTARY_TEST_PRG@ \ 27@ELEMENTARY_TEST_PRG@ \
@@ -67,6 +60,7 @@ test_datetime.c \
67test_dayselector.c \ 60test_dayselector.c \
68test_diskselector.c \ 61test_diskselector.c \
69test_dnd.c \ 62test_dnd.c \
63test_eio.c \
70test_entry.c \ 64test_entry.c \
71test_entry_anchor.c \ 65test_entry_anchor.c \
72test_entry_anchor2.c \ 66test_entry_anchor2.c \
@@ -142,19 +136,12 @@ test_win_plug.c \
142test_win_state.c \ 136test_win_state.c \
143test.h 137test.h
144 138
145if HAVE_EIO
146elementary_test_SOURCES += test_eio.c
147endif
148
149elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \ 139elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
150 @ELEMENTARY_WAYLAND_LIBS@ \ 140 @ELEMENTARY_WAYLAND_LIBS@ \
151 @ELEMENTARY_EWEATHER_LIBS@ \ 141 @ELEMENTARY_EWEATHER_LIBS@ \
152 @ELEMENTARY_ELDBUS_LIBS@ \
153 @ELEMENTARY_EFREET_LIBS@ \
154 @ELEMENTARY_ELOCATION_LIBS@ \ 142 @ELEMENTARY_ELOCATION_LIBS@ \
155 @ELEMENTARY_EMAP_LIBS@ \ 143 @ELEMENTARY_EMAP_LIBS@ \
156 @ELEMENTARY_LIBS@ \ 144 @ELEMENTARY_LIBS@ \
157 @EIO_LIBS@ \
158 @ELEMENTARY_WEB_LIBS@ \ 145 @ELEMENTARY_WEB_LIBS@ \
159 @my_libs@ 146 @my_libs@
160elementary_test_CFLAGS = 147elementary_test_CFLAGS =
@@ -166,12 +153,9 @@ config.c
166elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \ 153elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
167 @ELEMENTARY_WAYLAND_LIBS@ \ 154 @ELEMENTARY_WAYLAND_LIBS@ \
168 @ELEMENTARY_EWEATHER_LIBS@ \ 155 @ELEMENTARY_EWEATHER_LIBS@ \
169 @ELEMENTARY_ELDBUS_LIBS@ \
170 @ELEMENTARY_EFREET_LIBS@ \
171 @ELEMENTARY_ELOCATION_LIBS@ \ 156 @ELEMENTARY_ELOCATION_LIBS@ \
172 @ELEMENTARY_EMAP_LIBS@ \ 157 @ELEMENTARY_EMAP_LIBS@ \
173 @ELEMENTARY_LIBS@ \ 158 @ELEMENTARY_LIBS@ \
174 @EIO_LIBS@ \
175 @ELEMENTARY_WEB_LIBS@ \ 159 @ELEMENTARY_WEB_LIBS@ \
176 @my_libs@ 160 @my_libs@
177elementary_config_LDFLAGS = 161elementary_config_LDFLAGS =
@@ -183,12 +167,9 @@ elementary_codegen_LDADD = \
183 $(top_builddir)/src/lib/libelementary.la \ 167 $(top_builddir)/src/lib/libelementary.la \
184 @ELEMENTARY_WAYLAND_LIBS@ \ 168 @ELEMENTARY_WAYLAND_LIBS@ \
185 @ELEMENTARY_EWEATHER_LIBS@ \ 169 @ELEMENTARY_EWEATHER_LIBS@ \
186 @ELEMENTARY_ELDBUS_LIBS@ \
187 @ELEMENTARY_EFREET_LIBS@ \
188 @ELEMENTARY_ELOCATION_LIBS@ \ 170 @ELEMENTARY_ELOCATION_LIBS@ \
189 @ELEMENTARY_EMAP_LIBS@ \ 171 @ELEMENTARY_EMAP_LIBS@ \
190 @ELEMENTARY_LIBS@ \ 172 @ELEMENTARY_LIBS@ \
191 @EIO_LIBS@ \
192 @ELEMENTARY_WEB_LIBS@ \ 173 @ELEMENTARY_WEB_LIBS@ \
193 @my_libs@ 174 @my_libs@
194elementary_codegen_LDFLAGS = 175elementary_codegen_LDFLAGS =
@@ -206,7 +187,6 @@ elm_prefs_cc_handlers.c
206elm_prefs_cc_LDADD = \ 187elm_prefs_cc_LDADD = \
207$(top_builddir)/src/lib/libelementary.la \ 188$(top_builddir)/src/lib/libelementary.la \
208@ELEMENTARY_LIBS@ \ 189@ELEMENTARY_LIBS@ \
209@EIO_LIBS@ \
210@my_libs@ 190@my_libs@
211 191
212if BUILD_QUICKLAUNCH 192if BUILD_QUICKLAUNCH
@@ -214,12 +194,9 @@ elementary_quicklaunch_SOURCES = quicklaunch.c
214elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \ 194elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
215 @ELEMENTARY_WAYLAND_LIBS@ \ 195 @ELEMENTARY_WAYLAND_LIBS@ \
216 @ELEMENTARY_EWEATHER_LIBS@ \ 196 @ELEMENTARY_EWEATHER_LIBS@ \
217 @ELEMENTARY_ELDBUS_LIBS@ \
218 @ELEMENTARY_EFREET_LIBS@ \
219 @ELEMENTARY_ELOCATION_LIBS@ \ 197 @ELEMENTARY_ELOCATION_LIBS@ \
220 @ELEMENTARY_EMAP_LIBS@ \ 198 @ELEMENTARY_EMAP_LIBS@ \
221 @ELEMENTARY_LIBS@ \ 199 @ELEMENTARY_LIBS@ \
222 @EIO_LIBS@ \
223 @ELEMENTARY_WEB_LIBS@ \ 200 @ELEMENTARY_WEB_LIBS@ \
224 @my_libs@ 201 @my_libs@
225elementary_quicklaunch_LDFLAGS = 202elementary_quicklaunch_LDFLAGS =