summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2014-06-11 08:44:03 +0200
committerCedric BAIL <c.bail@partner.samsung.com>2014-06-12 03:12:15 +0200
commita2a5274f8b46869fe9ede1c55490695426463040 (patch)
treec3ede67c61e6a4c1b037a2b65e8d6046f2265a40
parentb0e08f231dcbcbbd444c3b7a6583f27179550546 (diff)
backend: remove Windows CE support Windows CE is dead and buried and its gcc port is even more dead and I don't believe in zombies
-rw-r--r--configure.ac47
-rw-r--r--doc/widgets/Makefile.am1
-rw-r--r--src/bin/Makefile.am1
-rw-r--r--src/bin/config.c1
-rw-r--r--src/edje_externals/Makefile.am1
-rw-r--r--src/lib/Elementary.h.in3
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/lib/elm_config.c1
-rw-r--r--src/lib/elm_config.h1
-rw-r--r--src/lib/elm_main.c1
-rw-r--r--src/lib/elm_priv.h24
-rw-r--r--src/lib/elm_win.c2
-rw-r--r--src/lib/elm_win.h2
-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
-rw-r--r--src/tests/Makefile.am1
19 files changed, 12 insertions, 81 deletions
diff --git a/configure.ac b/configure.ac
index cd1486747..5693e9f93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,22 +35,9 @@ AC_SUBST(DEPS_EOLIAN_FLAGS)
35 35
36ELM_UNIX_DEF="#undef" 36ELM_UNIX_DEF="#undef"
37ELM_WIN32_DEF="#undef" 37ELM_WIN32_DEF="#undef"
38ELM_WINCE_DEF="#undef"
39have_windows="no" 38have_windows="no"
40have_dlopen="no" 39have_dlopen="no"
41case "$host_os" in 40case "$host_os" in
42 mingw32ce*)
43 PKG_CHECK_MODULES([EVIL], [evil])
44 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
45 ELM_WINCE_DEF="#define"
46 have_windows="yes"
47dnl managed by evil
48 AC_DEFINE(HAVE_DLADDR)
49 have_dlopen="yes"
50 dlopen_libs=-ldl
51 requirement_elm="evil"
52 have_socket="no"
53 ;;
54 mingw*) 41 mingw*)
55 PKG_CHECK_MODULES([EVIL], [evil]) 42 PKG_CHECK_MODULES([EVIL], [evil])
56 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.]) 43 AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
@@ -127,14 +114,7 @@ ELM_VERSION_MINOR="v_min"
127AC_SUBST(ELM_VERSION_MAJOR) 114AC_SUBST(ELM_VERSION_MAJOR)
128AC_SUBST(ELM_VERSION_MINOR) 115AC_SUBST(ELM_VERSION_MINOR)
129 116
130case "$host_os" in 117MODULE_ARCH="v-v_maj.v_min.v_mic"
131 mingw32ce* | cegcc*)
132 MODULE_ARCH="v"
133 ;;
134 *)
135 MODULE_ARCH="v-v_maj.v_min.v_mic"
136 ;;
137esac
138AC_SUBST(MODULE_ARCH) 118AC_SUBST(MODULE_ARCH)
139AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") 119AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
140 120
@@ -188,7 +168,6 @@ getuid \
188AC_SUBST(dlopen_libs) 168AC_SUBST(dlopen_libs)
189AC_SUBST(ELM_UNIX_DEF) 169AC_SUBST(ELM_UNIX_DEF)
190AC_SUBST(ELM_WIN32_DEF) 170AC_SUBST(ELM_WIN32_DEF)
191AC_SUBST(ELM_WINCE_DEF)
192 171
193AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) 172AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"])
194 173
@@ -378,29 +357,6 @@ if test "x$want_elementary_win32" = "xyes" -a "x$have_elementary_win32" = "xno";
378 AC_MSG_ERROR([ecore-win32 support requested, but ecore-win32 was not found by pkg-config.]) 357 AC_MSG_ERROR([ecore-win32 support requested, but ecore-win32 was not found by pkg-config.])
379fi 358fi
380 359
381have_elementary_wince="no"
382want_elementary_wince="auto"
383AC_ARG_ENABLE([ecore-wince],
384 [AC_HELP_STRING([--disable-ecore-wince], [disable ecore-wince support. @<:@default=detect@:>@])],
385 [want_elementary_wince=$enableval], [])
386
387if test "x$want_elementary_wince" != "xno"; then
388 PKG_CHECK_MODULES([ELEMENTARY_WINCE],
389 [ecore-wince >= efl_version],
390 [
391 AC_DEFINE(HAVE_ELEMENTARY_WINCE, 1, [Windows CE support for Elementary])
392 have_elementary_wince="yes"
393 requirement_elm="ecore-wince >= efl_version ${requirement_elm}"
394 ],
395 [have_elementary_wince="no"]
396 )
397else
398 have_elementary_wince="no"
399fi
400if test "x$want_elementary_wince" = "xyes" -a "x$have_elementary_wince" = "xno"; then
401 AC_MSG_ERROR([ecore-wince support requested, but ecore-wince was not found by pkg-config.])
402fi
403
404have_elementary_wayland="no" 360have_elementary_wayland="no"
405want_elementary_wayland="auto" 361want_elementary_wayland="auto"
406AC_ARG_ENABLE([ecore-wayland], 362AC_ARG_ENABLE([ecore-wayland],
@@ -754,7 +710,6 @@ echo " PSL1GHT................: ${have_elementary_psl1ght}"
754echo " SDL....................: ${have_elementary_sdl}" 710echo " SDL....................: ${have_elementary_sdl}"
755echo " Cocoa..................: ${have_elementary_cocoa}" 711echo " Cocoa..................: ${have_elementary_cocoa}"
756echo " Windows XP.............: ${have_elementary_win32}" 712echo " Windows XP.............: ${have_elementary_win32}"
757echo " Windows CE.............: ${have_elementary_wince}"
758echo " Wayland................: ${have_elementary_wayland}" 713echo " Wayland................: ${have_elementary_wayland}"
759echo 714echo
760echo " Features:" 715echo " Features:"
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index 0553b8d17..3fd2ccf2c 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -16,7 +16,6 @@ AM_CPPFLAGS = \
16@ELEMENTARY_X_CFLAGS@ \ 16@ELEMENTARY_X_CFLAGS@ \
17@ELEMENTARY_FB_CFLAGS@ \ 17@ELEMENTARY_FB_CFLAGS@ \
18@ELEMENTARY_WIN32_CFLAGS@ \ 18@ELEMENTARY_WIN32_CFLAGS@ \
19@ELEMENTARY_WINCE_CFLAGS@ \
20@ELEMENTARY_ELOCATION_CFLAGS@ \ 19@ELEMENTARY_ELOCATION_CFLAGS@ \
21@ELEMENTARY_EWEATHER_CFLAGS@ \ 20@ELEMENTARY_EWEATHER_CFLAGS@ \
22@ELEMENTARY_WEB_CFLAGS@ \ 21@ELEMENTARY_WEB_CFLAGS@ \
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 3ef146ce0..50e79ef64 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
15@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
16@ELEMENTARY_SDL_CFLAGS@ \ 16@ELEMENTARY_SDL_CFLAGS@ \
17@ELEMENTARY_WIN32_CFLAGS@ \ 17@ELEMENTARY_WIN32_CFLAGS@ \
18@ELEMENTARY_WINCE_CFLAGS@ \
19@ELEMENTARY_ELOCATION_CFLAGS@ \ 18@ELEMENTARY_ELOCATION_CFLAGS@ \
20@ELEMENTARY_EWEATHER_CFLAGS@ \ 19@ELEMENTARY_EWEATHER_CFLAGS@ \
21@ELEMENTARY_WEB_CFLAGS@ \ 20@ELEMENTARY_WEB_CFLAGS@ \
diff --git a/src/bin/config.c b/src/bin/config.c
index 755cfba2e..8bc51f746 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -3407,7 +3407,6 @@ _elm_engine_supported(const char *engine)
3407 "xrender_x11", 3407 "xrender_x11",
3408 "opengl_x11", 3408 "opengl_x11",
3409 "software_gdi", 3409 "software_gdi",
3410 "software_16_wince_gdi",
3411 "sdl", 3410 "sdl",
3412 "software_16_sdl", 3411 "software_16_sdl",
3413 "opengl_sdl", 3412 "opengl_sdl",
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index c5884f73f..ab4d73b4b 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS = \
13@ELEMENTARY_X_CFLAGS@ \ 13@ELEMENTARY_X_CFLAGS@ \
14@ELEMENTARY_FB_CFLAGS@ \ 14@ELEMENTARY_FB_CFLAGS@ \
15@ELEMENTARY_WIN32_CFLAGS@ \ 15@ELEMENTARY_WIN32_CFLAGS@ \
16@ELEMENTARY_WINCE_CFLAGS@ \
17@ELEMENTARY_ELOCATION_CFLAGS@ \ 16@ELEMENTARY_ELOCATION_CFLAGS@ \
18@ELEMENTARY_EMAP_CFLAGS@ \ 17@ELEMENTARY_EMAP_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \ 18@ELEMENTARY_WEB_CFLAGS@ \
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 30164d93f..351e70aea 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -13,7 +13,6 @@
13 13
14@ELM_UNIX_DEF@ ELM_UNIX 14@ELM_UNIX_DEF@ ELM_UNIX
15@ELM_WIN32_DEF@ ELM_WIN32 15@ELM_WIN32_DEF@ ELM_WIN32
16@ELM_WINCE_DEF@ ELM_WINCE
17@ELM_ELOCATION_DEF@ ELM_ELOCATION 16@ELM_ELOCATION_DEF@ ELM_ELOCATION
18@ELM_WEB_DEF@ ELM_WEB 17@ELM_WEB_DEF@ ELM_WEB
19@ELM_WEB2_DEF@ ELM_WEB2 18@ELM_WEB2_DEF@ ELM_WEB2
@@ -57,7 +56,7 @@
57#include <alloca.h> 56#include <alloca.h>
58#endif 57#endif
59 58
60#if defined (ELM_WIN32) || defined (ELM_WINCE) 59#ifdef ELM_WIN32
61#include <malloc.h> 60#include <malloc.h>
62#ifndef alloca 61#ifndef alloca
63#define alloca _alloca 62#define alloca _alloca
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f76a9df00..5a26bc663 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -26,7 +26,6 @@ AM_CPPFLAGS = \
26@ELEMENTARY_FB_CFLAGS@ \ 26@ELEMENTARY_FB_CFLAGS@ \
27@ELEMENTARY_SDL_CFLAGS@ \ 27@ELEMENTARY_SDL_CFLAGS@ \
28@ELEMENTARY_WIN32_CFLAGS@ \ 28@ELEMENTARY_WIN32_CFLAGS@ \
29@ELEMENTARY_WINCE_CFLAGS@ \
30@ELEMENTARY_ELOCATION_CFLAGS@ \ 29@ELEMENTARY_ELOCATION_CFLAGS@ \
31@ELEMENTARY_EWEATHER_CFLAGS@ \ 30@ELEMENTARY_EWEATHER_CFLAGS@ \
32@ELEMENTARY_WEB_CFLAGS@ \ 31@ELEMENTARY_WEB_CFLAGS@ \
@@ -520,7 +519,6 @@ libelementary_la_LIBADD = \
520@ELEMENTARY_FB_LIBS@ \ 519@ELEMENTARY_FB_LIBS@ \
521@ELEMENTARY_SDL_LIBS@ \ 520@ELEMENTARY_SDL_LIBS@ \
522@ELEMENTARY_WIN32_LIBS@ \ 521@ELEMENTARY_WIN32_LIBS@ \
523@ELEMENTARY_WINCE_LIBS@ \
524@ELEMENTARY_ELOCATION_LIBS@ \ 522@ELEMENTARY_ELOCATION_LIBS@ \
525@ELEMENTARY_WEB_LIBS@ \ 523@ELEMENTARY_WEB_LIBS@ \
526@ELEMENTARY_EMAP_LIBS@ \ 524@ELEMENTARY_EMAP_LIBS@ \
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 68edc0822..a5e692d02 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -41,7 +41,6 @@ const char *_elm_engines[] = {
41 "xrender_x11", 41 "xrender_x11",
42 "opengl_x11", 42 "opengl_x11",
43 "software_gdi", 43 "software_gdi",
44 "software_16_wince_gdi",
45 "sdl", 44 "sdl",
46 "software_16_sdl", 45 "software_16_sdl",
47 "opengl_sdl", 46 "opengl_sdl",
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 8340661b7..3233d48a2 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -786,7 +786,6 @@ EAPI void elm_config_password_show_last_timeout_set(double password_show_la
786 * @li "xrender_x11" 786 * @li "xrender_x11"
787 * @li "opengl_x11" 787 * @li "opengl_x11"
788 * @li "software_gdi" 788 * @li "software_gdi"
789 * @li "software_16_wince_gdi"
790 * @li "sdl" 789 * @li "sdl"
791 * @li "software_16_sdl" 790 * @li "software_16_sdl"
792 * @li "opengl_sdl" 791 * @li "opengl_sdl"
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 16b60e331..9ca9a03bb 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -708,7 +708,6 @@ elm_quicklaunch_sub_shutdown(void)
708 ENGINE_COMPARE(ELM_OPENGL_SDL) || 708 ENGINE_COMPARE(ELM_OPENGL_SDL) ||
709 ENGINE_COMPARE(ELM_OPENGL_COCOA) || 709 ENGINE_COMPARE(ELM_OPENGL_COCOA) ||
710 ENGINE_COMPARE(ELM_SOFTWARE_WIN32) || 710 ENGINE_COMPARE(ELM_SOFTWARE_WIN32) ||
711 ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE) ||
712 ENGINE_COMPARE(ELM_EWS)) 711 ENGINE_COMPARE(ELM_EWS))
713#undef ENGINE_COMPARE 712#undef ENGINE_COMPARE
714 evas_cserve_disconnect(); 713 evas_cserve_disconnect();
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 2ee65cfa0..c9994df29 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -6,9 +6,6 @@
6#ifdef HAVE_ELEMENTARY_FB 6#ifdef HAVE_ELEMENTARY_FB
7#include <Ecore_Fb.h> 7#include <Ecore_Fb.h>
8#endif 8#endif
9#ifdef HAVE_ELEMENTARY_WINCE
10#include <Ecore_WinCE.h>
11#endif
12#ifdef HAVE_ELEMENTARY_WAYLAND 9#ifdef HAVE_ELEMENTARY_WAYLAND
13#include <Ecore_Wayland.h> 10#include <Ecore_Wayland.h>
14#endif 11#endif
@@ -145,17 +142,16 @@ extern const char *_elm_engines[];
145#define ELM_XRENDER_X11 (_elm_engines[5]) 142#define ELM_XRENDER_X11 (_elm_engines[5])
146#define ELM_OPENGL_X11 (_elm_engines[6]) 143#define ELM_OPENGL_X11 (_elm_engines[6])
147#define ELM_SOFTWARE_WIN32 (_elm_engines[7]) 144#define ELM_SOFTWARE_WIN32 (_elm_engines[7])
148#define ELM_SOFTWARE_16_WINCE (_elm_engines[8]) 145#define ELM_SOFTWARE_SDL (_elm_engines[8])
149#define ELM_SOFTWARE_SDL (_elm_engines[9]) 146#define ELM_SOFTWARE_16_SDL (_elm_engines[9])
150#define ELM_SOFTWARE_16_SDL (_elm_engines[10]) 147#define ELM_OPENGL_SDL (_elm_engines[10])
151#define ELM_OPENGL_SDL (_elm_engines[11]) 148#define ELM_BUFFER (_elm_engines[11])
152#define ELM_BUFFER (_elm_engines[12]) 149#define ELM_EWS (_elm_engines[12])
153#define ELM_EWS (_elm_engines[13]) 150#define ELM_OPENGL_COCOA (_elm_engines[13])
154#define ELM_OPENGL_COCOA (_elm_engines[14]) 151#define ELM_SOFTWARE_PSL1GHT (_elm_engines[14])
155#define ELM_SOFTWARE_PSL1GHT (_elm_engines[15]) 152#define ELM_WAYLAND_SHM (_elm_engines[15])
156#define ELM_WAYLAND_SHM (_elm_engines[16]) 153#define ELM_WAYLAND_EGL (_elm_engines[16])
157#define ELM_WAYLAND_EGL (_elm_engines[17]) 154#define ELM_DRM (_elm_engines[17])
158#define ELM_DRM (_elm_engines[18])
159 155
160#define ELM_FONT_TOKEN_STYLE ":style=" 156#define ELM_FONT_TOKEN_STYLE ":style="
161 157
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index abc13e6e5..2e89154b2 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -3638,7 +3638,6 @@ _elm_win_fullscreen_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool fullscr
3638{ 3638{
3639 // YYY: handle if sd->img_obj 3639 // YYY: handle if sd->img_obj
3640 if (ENGINE_COMPARE(ELM_SOFTWARE_FB) || 3640 if (ENGINE_COMPARE(ELM_SOFTWARE_FB) ||
3641 ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE) ||
3642 ENGINE_COMPARE(ELM_DRM)) 3641 ENGINE_COMPARE(ELM_DRM))
3643 { 3642 {
3644 // these engines... can ONLY be fullscreen 3643 // these engines... can ONLY be fullscreen
@@ -3686,7 +3685,6 @@ _elm_win_fullscreen_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd)
3686 3685
3687 if (engine_name && 3686 if (engine_name &&
3688 ((!strcmp(engine_name, ELM_SOFTWARE_FB)) || 3687 ((!strcmp(engine_name, ELM_SOFTWARE_FB)) ||
3689 (!strcmp(engine_name, ELM_SOFTWARE_16_WINCE)) ||
3690 (!strcmp(engine_name, ELM_DRM)))) 3688 (!strcmp(engine_name, ELM_DRM))))
3691 { 3689 {
3692 // these engines... can ONLY be fullscreen 3690 // these engines... can ONLY be fullscreen
diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h
index cfb480bc0..f60153820 100644
--- a/src/lib/elm_win.h
+++ b/src/lib/elm_win.h
@@ -35,8 +35,6 @@
35 * grayscale using dedicated 8bit software engine in X11) 35 * grayscale using dedicated 8bit software engine in X11)
36 * @li "x11-16", "x16", "software-16-x11", "software_16_x11" (Rendering in 36 * @li "x11-16", "x16", "software-16-x11", "software_16_x11" (Rendering in
37 * X11 using 16bit software engine) 37 * X11 using 16bit software engine)
38 * @li "wince-gdi", "software-16-wince-gdi", "software_16_wince_gdi"
39 * (Windows CE rendering via GDI with 16bit software renderer)
40 * @li "sdl-16", "software-16-sdl", "software_16_sdl" (Rendering to SDL 38 * @li "sdl-16", "software-16-sdl", "software_16_sdl" (Rendering to SDL
41 * buffer with 16bit software renderer) 39 * buffer with 16bit software renderer)
42 * @li "ews" (rendering to EWS - Ecore + Evas Single Process Windowing System) 40 * @li "ews" (rendering to EWS - Ecore + Evas Single Process Windowing System)
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index bb88b8166..06b940f38 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
14@ELEMENTARY_FB_CFLAGS@ \ 14@ELEMENTARY_FB_CFLAGS@ \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_ELOCATION_CFLAGS@ \ 17@ELEMENTARY_ELOCATION_CFLAGS@ \
19@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
20@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index e46a7945f..ddbc4cc18 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -15,7 +15,6 @@ AM_CPPFLAGS = \
15@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
16@ELEMENTARY_SDL_CFLAGS@ \ 16@ELEMENTARY_SDL_CFLAGS@ \
17@ELEMENTARY_WIN32_CFLAGS@ \ 17@ELEMENTARY_WIN32_CFLAGS@ \
18@ELEMENTARY_WINCE_CFLAGS@ \
19@ELEMENTARY_ELOCATION_CFLAGS@ \ 18@ELEMENTARY_ELOCATION_CFLAGS@ \
20@ELEMENTARY_EWEATHER_CFLAGS@ \ 19@ELEMENTARY_EWEATHER_CFLAGS@ \
21@ELEMENTARY_WEB_CFLAGS@ \ 20@ELEMENTARY_WEB_CFLAGS@ \
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 57a36b1f0..023ddf4e2 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -27,7 +27,6 @@ AM_CPPFLAGS = \
27@ELEMENTARY_FB_CFLAGS@ \ 27@ELEMENTARY_FB_CFLAGS@ \
28@ELEMENTARY_SDL_CFLAGS@ \ 28@ELEMENTARY_SDL_CFLAGS@ \
29@ELEMENTARY_WIN32_CFLAGS@ \ 29@ELEMENTARY_WIN32_CFLAGS@ \
30@ELEMENTARY_WINCE_CFLAGS@ \
31@ELEMENTARY_ELOCATION_CFLAGS@ \ 30@ELEMENTARY_ELOCATION_CFLAGS@ \
32@ELEMENTARY_WEB_CFLAGS@ \ 31@ELEMENTARY_WEB_CFLAGS@ \
33@ELEMENTARY_EMAP_CFLAGS@ \ 32@ELEMENTARY_EMAP_CFLAGS@ \
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index 2662d9520..7eec5a94b 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
14@ELEMENTARY_FB_CFLAGS@ \ 14@ELEMENTARY_FB_CFLAGS@ \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_ELOCATION_CFLAGS@ \ 17@ELEMENTARY_ELOCATION_CFLAGS@ \
19@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
20@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 12017866e..6d2565991 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -14,7 +14,6 @@ AM_CPPFLAGS = \
14@ELEMENTARY_FB_CFLAGS@ \ 14@ELEMENTARY_FB_CFLAGS@ \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_ELOCATION_CFLAGS@ \ 17@ELEMENTARY_ELOCATION_CFLAGS@ \
19@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
20@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index dbd18c336..11dcd878e 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -81,7 +81,6 @@ elm_suite_CPPFLAGS = \
81 @ELEMENTARY_FB_CFLAGS@ \ 81 @ELEMENTARY_FB_CFLAGS@ \
82 @ELEMENTARY_SDL_CFLAGS@ \ 82 @ELEMENTARY_SDL_CFLAGS@ \
83 @ELEMENTARY_WIN32_CFLAGS@ \ 83 @ELEMENTARY_WIN32_CFLAGS@ \
84 @ELEMENTARY_WINCE_CFLAGS@ \
85 @ELEMENTARY_ELOCATION_CFLAGS@ \ 84 @ELEMENTARY_ELOCATION_CFLAGS@ \
86 @ELEMENTARY_EWEATHER_CFLAGS@ \ 85 @ELEMENTARY_EWEATHER_CFLAGS@ \
87 @ELEMENTARY_WEB_CFLAGS@ \ 86 @ELEMENTARY_WEB_CFLAGS@ \