summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2013-01-10 07:50:14 +0000
committerCedric BAIL <cedric.bail@free.fr>2013-01-10 07:50:14 +0000
commit426f4de6b74e310a7e2ac1755b4cf6d6f94c2c0d (patch)
tree16d9104c0f513c6b3c16617e47f60c7deb14824e
parent8f2ab5c7cbdd9431f51b7989de9fd73472dcb642 (diff)
elementary: remove build dependencie from old e_dbus.
SVN revision: 82517
-rw-r--r--ChangeLog5
-rw-r--r--NEWS1
-rw-r--r--configure.ac30
-rw-r--r--src/bin/Makefile.am7
-rw-r--r--src/edje_externals/Makefile.am1
-rw-r--r--src/examples/Makefile.am1
-rw-r--r--src/lib/Elementary.h.in4
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/lib/elm_main.c28
-rw-r--r--src/modules/access_output/Makefile.am1
-rw-r--r--src/modules/datetime_input_ctxpopup/Makefile.am1
-rw-r--r--src/modules/prefs/Makefile.am1
-rw-r--r--src/modules/test_entry/Makefile.am1
-rw-r--r--src/modules/test_map/Makefile.am1
14 files changed, 25 insertions, 59 deletions
diff --git a/ChangeLog b/ChangeLog
index d65319c65..c62baa9d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -894,3 +894,8 @@
8942013-01-06 Jaehyun Cho <jae_hyun_cho@naver.com> 8942013-01-06 Jaehyun Cho <jae_hyun_cho@naver.com>
895 895
896 * Fix omitting signal emission when customized text parts change the text. 896 * Fix omitting signal emission when customized text parts change the text.
897
8982013-01-10 Cedric Bail
899
900 * Don't link anymore with E_DBus at build time.
901
diff --git a/NEWS b/NEWS
index 590a65298..73c778b95 100644
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,7 @@ Improvements:
50 * Merged the file_entry and the path_entry in the fileselector and allowing typing the path. 50 * Merged the file_entry and the path_entry in the fileselector and allowing typing the path.
51 * Setting the same font size of the others widgets for the dayselector. 51 * Setting the same font size of the others widgets for the dayselector.
52 * Added a separated spinner for year on calendar. 52 * Added a separated spinner for year on calendar.
53 * Don't link anymore with E_DBus at build time.
53 54
54Fixes: 55Fixes:
55 56
diff --git a/configure.ac b/configure.ac
index 2601f820d..39c307bae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,34 +472,6 @@ if test "x$want_elementary_wayland" = "xyes" -a "x$have_elementary_wayland" = "x
472 AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.]) 472 AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.])
473fi 473fi
474 474
475ELM_EDBUS_DEF="#undef"
476have_elementary_edbus="no"
477want_elementary_edbus="no"
478AC_ARG_ENABLE([edbus],
479 [AC_HELP_STRING([--enable-edbus], [enable edbus (v1) support. @<:@default=no@:>@])],
480 [want_elementary_edbus=$enableval], [])
481
482if test "x$want_elementary_edbus" != "xno"; then
483 PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
484 [
485 edbus >= 1.6.99
486 ],
487 [
488 AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
489 have_elementary_edbus="yes"
490 ELM_EDBUS_DEF="#define"
491 requirement_elm="edbus >= 1.6.99 ${requirement_elm}"
492 ],
493 [have_elementary_edbus="no"]
494 )
495else
496 have_elementary_edbus="no"
497fi
498if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno"; then
499 AC_MSG_ERROR([E_DBus support requested, but no e_dbus found by pkg-config.])
500fi
501AC_SUBST(ELM_EDBUS_DEF)
502
503ELM_EDBUS2_DEF="#undef" 475ELM_EDBUS2_DEF="#undef"
504have_elementary_edbus2="no" 476have_elementary_edbus2="no"
505want_elementary_edbus2="auto" 477want_elementary_edbus2="auto"
@@ -873,7 +845,7 @@ echo
873echo " Features:" 845echo " Features:"
874echo " Ecore_IMF..............: ${have_ecore_imf}" 846echo " Ecore_IMF..............: ${have_ecore_imf}"
875echo " Ecore_Con..............: ${have_ecore_con}" 847echo " Ecore_Con..............: ${have_ecore_con}"
876echo " EDBus..................: v1=${have_elementary_edbus}, v2=${have_elementary_edbus2}" 848echo " EDBus..................: v2=${have_elementary_edbus2}"
877echo " EFreet.................: ${have_elementary_efreet}" 849echo " EFreet.................: ${have_elementary_efreet}"
878echo " EWeather...............: ${have_elementary_eweather}" 850echo " EWeather...............: ${have_elementary_eweather}"
879echo " EMap...................: ${have_elementary_emap}" 851echo " EMap...................: ${have_elementary_emap}"
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 12bf6efaf..b1ae9353a 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -16,7 +16,6 @@ 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_EDBUS_CFLAGS@ \
20@ELEMENTARY_EDBUS2_CFLAGS@ \ 19@ELEMENTARY_EDBUS2_CFLAGS@ \
21@ELEMENTARY_EFREET_CFLAGS@ \ 20@ELEMENTARY_EFREET_CFLAGS@ \
22@ELEMENTARY_ELOCATION_CFLAGS@ \ 21@ELEMENTARY_ELOCATION_CFLAGS@ \
@@ -145,7 +144,6 @@ endif
145 144
146elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \ 145elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
147 @ELEMENTARY_EWEATHER_LIBS@ \ 146 @ELEMENTARY_EWEATHER_LIBS@ \
148 @ELEMENTARY_EDBUS_LIBS@ \
149 @ELEMENTARY_EDBUS2_LIBS@ \ 147 @ELEMENTARY_EDBUS2_LIBS@ \
150 @ELEMENTARY_EFREET_LIBS@ \ 148 @ELEMENTARY_EFREET_LIBS@ \
151 @ELEMENTARY_ELOCATION_LIBS@ \ 149 @ELEMENTARY_ELOCATION_LIBS@ \
@@ -161,7 +159,6 @@ config.c
161 159
162elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \ 160elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
163 @ELEMENTARY_EWEATHER_LIBS@ \ 161 @ELEMENTARY_EWEATHER_LIBS@ \
164 @ELEMENTARY_EDBUS_LIBS@ \
165 @ELEMENTARY_EDBUS2_LIBS@ \ 162 @ELEMENTARY_EDBUS2_LIBS@ \
166 @ELEMENTARY_EFREET_LIBS@ \ 163 @ELEMENTARY_EFREET_LIBS@ \
167 @ELEMENTARY_ELOCATION_LIBS@ \ 164 @ELEMENTARY_ELOCATION_LIBS@ \
@@ -178,7 +175,6 @@ elementary_codegen.c
178elementary_codegen_LDADD = \ 175elementary_codegen_LDADD = \
179 $(top_builddir)/src/lib/libelementary.la \ 176 $(top_builddir)/src/lib/libelementary.la \
180 @ELEMENTARY_EWEATHER_LIBS@ \ 177 @ELEMENTARY_EWEATHER_LIBS@ \
181 @ELEMENTARY_EDBUS_LIBS@ \
182 @ELEMENTARY_EDBUS2_LIBS@ \ 178 @ELEMENTARY_EDBUS2_LIBS@ \
183 @ELEMENTARY_EFREET_LIBS@ \ 179 @ELEMENTARY_EFREET_LIBS@ \
184 @ELEMENTARY_ELOCATION_LIBS@ \ 180 @ELEMENTARY_ELOCATION_LIBS@ \
@@ -209,7 +205,6 @@ if BUILD_QUICKLAUNCH
209elementary_quicklaunch_SOURCES = quicklaunch.c 205elementary_quicklaunch_SOURCES = quicklaunch.c
210elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \ 206elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
211 @ELEMENTARY_EWEATHER_LIBS@ \ 207 @ELEMENTARY_EWEATHER_LIBS@ \
212 @ELEMENTARY_EDBUS_LIBS@ \
213 @ELEMENTARY_EDBUS2_LIBS@ \ 208 @ELEMENTARY_EDBUS2_LIBS@ \
214 @ELEMENTARY_EFREET_LIBS@ \ 209 @ELEMENTARY_EFREET_LIBS@ \
215 @ELEMENTARY_ELOCATION_LIBS@ \ 210 @ELEMENTARY_ELOCATION_LIBS@ \
@@ -236,7 +231,6 @@ elementary_testql_LTLIBRARIES = elementary_testql.la
236elementary_testql_la_SOURCES = $(elementary_test_SOURCES) 231elementary_testql_la_SOURCES = $(elementary_test_SOURCES)
237elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \ 232elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \
238 @ELEMENTARY_EWEATHER_LIBS@ \ 233 @ELEMENTARY_EWEATHER_LIBS@ \
239 @ELEMENTARY_EDBUS_LIBS@ \
240 @ELEMENTARY_EDBUS2_LIBS@ \ 234 @ELEMENTARY_EDBUS2_LIBS@ \
241 @ELEMENTARY_EFREET_LIBS@ \ 235 @ELEMENTARY_EFREET_LIBS@ \
242 @ELEMENTARY_ELOCATION_LIBS@ \ 236 @ELEMENTARY_ELOCATION_LIBS@ \
@@ -251,7 +245,6 @@ elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
251elementary_testql_SOURCES = $(elementary_test_SOURCES) 245elementary_testql_SOURCES = $(elementary_test_SOURCES)
252elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \ 246elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
253 @ELEMENTARY_EWEATHER_LIBS@ \ 247 @ELEMENTARY_EWEATHER_LIBS@ \
254 @ELEMENTARY_EDBUS_LIBS@ \
255 @ELEMENTARY_EDBUS2_LIBS@ \ 248 @ELEMENTARY_EDBUS2_LIBS@ \
256 @ELEMENTARY_EFREET_LIBS@ \ 249 @ELEMENTARY_EFREET_LIBS@ \
257 @ELEMENTARY_ELOCATION_LIBS@ \ 250 @ELEMENTARY_ELOCATION_LIBS@ \
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index 3dfb933a6..eec24631d 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
14@ELEMENTARY_FB_CFLAGS@ \ 14@ELEMENTARY_FB_CFLAGS@ \
15@ELEMENTARY_WIN32_CFLAGS@ \ 15@ELEMENTARY_WIN32_CFLAGS@ \
16@ELEMENTARY_WINCE_CFLAGS@ \ 16@ELEMENTARY_WINCE_CFLAGS@ \
17@ELEMENTARY_EDBUS_CFLAGS@ \
18@ELEMENTARY_EDBUS2_CFLAGS@ \ 17@ELEMENTARY_EDBUS2_CFLAGS@ \
19@ELEMENTARY_EFREET_CFLAGS@ \ 18@ELEMENTARY_EFREET_CFLAGS@ \
20@ELEMENTARY_ELOCATION_CFLAGS@ \ 19@ELEMENTARY_ELOCATION_CFLAGS@ \
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 00edbd18c..9f07759c8 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
14-DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \ 14-DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \
15-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 15-DPACKAGE_BIN_DIR=\"$(bindir)\" \
16-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 16-DPACKAGE_LIB_DIR=\"$(libdir)\" \
17@ELEMENTARY_EDBUS_CFLAGS@ \
18@ELEMENTARY_EDBUS2_CFLAGS@ \ 17@ELEMENTARY_EDBUS2_CFLAGS@ \
19@ELEMENTARY_EFREET_CFLAGS@ \ 18@ELEMENTARY_EFREET_CFLAGS@ \
20@ELEMENTARY_ELOCATION_CFLAGS@ \ 19@ELEMENTARY_ELOCATION_CFLAGS@ \
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 04b7b0bc8..6e4bb9a5d 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -10,7 +10,6 @@
10@ELM_UNIX_DEF@ ELM_UNIX 10@ELM_UNIX_DEF@ ELM_UNIX
11@ELM_WIN32_DEF@ ELM_WIN32 11@ELM_WIN32_DEF@ ELM_WIN32
12@ELM_WINCE_DEF@ ELM_WINCE 12@ELM_WINCE_DEF@ ELM_WINCE
13@ELM_EDBUS_DEF@ ELM_EDBUS
14@ELM_EDBUS2_DEF@ ELM_EDBUS2 13@ELM_EDBUS2_DEF@ ELM_EDBUS2
15@ELM_EFREET_DEF@ ELM_EFREET 14@ELM_EFREET_DEF@ ELM_EFREET
16@ELM_ELOCATION_DEF@ ELM_ELOCATION 15@ELM_ELOCATION_DEF@ ELM_ELOCATION
@@ -75,9 +74,6 @@
75@ELEMENTARY_ECORE_CON_INC@ 74@ELEMENTARY_ECORE_CON_INC@
76#include <Edje.h> 75#include <Edje.h>
77 76
78#ifdef ELM_EDBUS
79#include <E_DBus.h>
80#endif
81#ifdef ELM_EDBUS2 77#ifdef ELM_EDBUS2
82#include <EDBus.h> 78#include <EDBus.h>
83#endif 79#endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6ab1f7698..a09a6dd88 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS = \
19@ELEMENTARY_SDL_CFLAGS@ \ 19@ELEMENTARY_SDL_CFLAGS@ \
20@ELEMENTARY_WIN32_CFLAGS@ \ 20@ELEMENTARY_WIN32_CFLAGS@ \
21@ELEMENTARY_WINCE_CFLAGS@ \ 21@ELEMENTARY_WINCE_CFLAGS@ \
22@ELEMENTARY_EDBUS_CFLAGS@ \
23@ELEMENTARY_EDBUS2_CFLAGS@ \ 22@ELEMENTARY_EDBUS2_CFLAGS@ \
24@ELEMENTARY_EFREET_CFLAGS@ \ 23@ELEMENTARY_EFREET_CFLAGS@ \
25@ELEMENTARY_ELOCATION_CFLAGS@ \ 24@ELEMENTARY_ELOCATION_CFLAGS@ \
@@ -316,7 +315,6 @@ libelementary_la_LIBADD = \
316@ELEMENTARY_SDL_LIBS@ \ 315@ELEMENTARY_SDL_LIBS@ \
317@ELEMENTARY_WIN32_LIBS@ \ 316@ELEMENTARY_WIN32_LIBS@ \
318@ELEMENTARY_WINCE_LIBS@ \ 317@ELEMENTARY_WINCE_LIBS@ \
319@ELEMENTARY_EDBUS_LIBS@ \
320@ELEMENTARY_EDBUS2_LIBS@ \ 318@ELEMENTARY_EDBUS2_LIBS@ \
321@ELEMENTARY_EFREET_LIBS@ \ 319@ELEMENTARY_EFREET_LIBS@ \
322@ELEMENTARY_ELOCATION_LIBS@ \ 320@ELEMENTARY_ELOCATION_LIBS@ \
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index a9c12369b..bb1c3594e 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -359,30 +359,38 @@ elm_app_locale_dir_get(void)
359 return app_locale_dir; 359 return app_locale_dir;
360} 360}
361 361
362#ifdef ELM_EDBUS
363static Eina_Bool _elm_need_e_dbus = EINA_FALSE; 362static Eina_Bool _elm_need_e_dbus = EINA_FALSE;
364#endif 363static void *e_dbus_handle = NULL;
364
365EAPI Eina_Bool 365EAPI Eina_Bool
366elm_need_e_dbus(void) 366elm_need_e_dbus(void)
367{ 367{
368#ifdef ELM_EDBUS 368 int (*init_func)(void) = NULL;
369
369 if (_elm_need_e_dbus) return EINA_TRUE; 370 if (_elm_need_e_dbus) return EINA_TRUE;
371 /* FIXME: Maybe we should use RTLD_NOLOAD */
372 if (!e_dbus_handle) dlopen("libedbus.so", RTLD_LAZY | RTLD_GLOBAL);
373 if (!e_dbus_handle) return EINA_FALSE;
374 init_func = dlsym(e_dbus_handle, "e_dbus_init");
375 if (!init_func) return EINA_FALSE;
370 _elm_need_e_dbus = EINA_TRUE; 376 _elm_need_e_dbus = EINA_TRUE;
371 e_dbus_init(); 377 init_func();
372 return EINA_TRUE; 378 return EINA_TRUE;
373#else
374 return EINA_FALSE;
375#endif
376} 379}
377 380
378static void 381static void
379_elm_unneed_e_dbus(void) 382_elm_unneed_e_dbus(void)
380{ 383{
381#ifdef ELM_EDBUS 384 int (*shutdown_func)(void) = NULL;
385
382 if (!_elm_need_e_dbus) return; 386 if (!_elm_need_e_dbus) return;
387 shutdown_func = dlsym(e_dbus_handle, "e_dbus_shutdown");
388 if (!shutdown_func) return;
383 _elm_need_e_dbus = EINA_FALSE; 389 _elm_need_e_dbus = EINA_FALSE;
384 e_dbus_shutdown(); 390 shutdown_func();
385#endif 391
392 dlclose(e_dbus_handle);
393 e_dbus_handle = NULL;
386} 394}
387 395
388#ifdef ELM_EDBUS2 396#ifdef ELM_EDBUS2
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index b1c3343a1..04b866d32 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \ 17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_EDBUS_CFLAGS@ \
19@ELEMENTARY_EDBUS2_CFLAGS@ \ 18@ELEMENTARY_EDBUS2_CFLAGS@ \
20@ELEMENTARY_EFREET_CFLAGS@ \ 19@ELEMENTARY_EFREET_CFLAGS@ \
21@ELEMENTARY_ELOCATION_CFLAGS@ \ 20@ELEMENTARY_ELOCATION_CFLAGS@ \
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index 12c48acad..c95fcd8af 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -16,7 +16,6 @@ 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_EDBUS_CFLAGS@ \
20@ELEMENTARY_EDBUS2_CFLAGS@ \ 19@ELEMENTARY_EDBUS2_CFLAGS@ \
21@ELEMENTARY_EFREET_CFLAGS@ \ 20@ELEMENTARY_EFREET_CFLAGS@ \
22@ELEMENTARY_ELOCATION_CFLAGS@ \ 21@ELEMENTARY_ELOCATION_CFLAGS@ \
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index a819e7ae6..7bdcfef8b 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -32,7 +32,6 @@ AM_CPPFLAGS = \
32@ELEMENTARY_SDL_CFLAGS@ \ 32@ELEMENTARY_SDL_CFLAGS@ \
33@ELEMENTARY_WIN32_CFLAGS@ \ 33@ELEMENTARY_WIN32_CFLAGS@ \
34@ELEMENTARY_WINCE_CFLAGS@ \ 34@ELEMENTARY_WINCE_CFLAGS@ \
35@ELEMENTARY_EDBUS_CFLAGS@ \
36@ELEMENTARY_EDBUS2_CFLAGS@ \ 35@ELEMENTARY_EDBUS2_CFLAGS@ \
37@ELEMENTARY_EFREET_CFLAGS@ \ 36@ELEMENTARY_EFREET_CFLAGS@ \
38@ELEMENTARY_ELOCATION_CFLAGS@ \ 37@ELEMENTARY_ELOCATION_CFLAGS@ \
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index b2bbd3ddf..6e74d5600 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \ 17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_EDBUS_CFLAGS@ \
19@ELEMENTARY_EDBUS2_CFLAGS@ \ 18@ELEMENTARY_EDBUS2_CFLAGS@ \
20@ELEMENTARY_EFREET_CFLAGS@ \ 19@ELEMENTARY_EFREET_CFLAGS@ \
21@ELEMENTARY_ELOCATION_CFLAGS@ \ 20@ELEMENTARY_ELOCATION_CFLAGS@ \
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 35e7e3ac6..afff4de0c 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \ 17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_EDBUS_CFLAGS@ \
19@ELEMENTARY_EDBUS2_CFLAGS@ \ 18@ELEMENTARY_EDBUS2_CFLAGS@ \
20@ELEMENTARY_EFREET_CFLAGS@ \ 19@ELEMENTARY_EFREET_CFLAGS@ \
21@ELEMENTARY_ELOCATION_CFLAGS@ \ 20@ELEMENTARY_ELOCATION_CFLAGS@ \