configure.ac: Clean up and add macros for backend-checks.

Add an m4 macro and start using it (also fixes some issues).

14 files changed, 62 insertions, 271 deletions

diff --git a/Makefile.am b/Makefile.am
index 9ab1e96ba..b03db14ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,7 @@ elementary.spec \
 elementary.spec.in \
 m4/efl_binary.m4 \
 m4/efl_doxygen.m4 \
+m4/elm_check_backend.m4 \
 config.rpath \
 pkgbuild/PKGBUILD
 
diff --git a/configure.ac b/configure.ac
index 6ecf4ec44..4b7d1b793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,6 +226,15 @@ requirement_elm="\
     eio >= efl_version \
     "
 
+ELM_CHECK_BACKEND([X])
+ELM_CHECK_BACKEND([FB])
+ELM_CHECK_BACKEND([PSL1GHT])
+ELM_CHECK_BACKEND([SDL])
+ELM_CHECK_BACKEND([Cocoa])
+ELM_CHECK_BACKEND([Win32])
+ELM_CHECK_BACKEND([Wayland])
+ELM_CHECK_BACKEND([DRM])
+
 PKG_CHECK_MODULES([ELEMENTARY],
    [${requirement_elm}])
 
@@ -432,191 +441,6 @@ esac
 
 
 
-have_elementary_x="no"
-want_elementary_x="auto"
-AC_ARG_ENABLE([ecore-x],
-   [AC_HELP_STRING([--disable-ecore-x], [disable ecore-x support. @<:@default=detect@:>@])],
-   [want_elementary_x=$enableval], [])
-
-if test "x$want_elementary_x" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_X],
-      [ecore-x >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_X, 1, [X11 support for Elementary])
-       have_elementary_x="yes"
-       requirement_elm="ecore-x >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_x="no"]
-   )
-else
-    have_elementary_x="no"
-fi
-if test "x$want_elementary_x" = "xyes" -a "x$have_elementary_x" = "xno"; then
-    AC_MSG_ERROR([ecore-x support requested, but ecore-x was not found by pkg-config.])
-fi
-
-
-have_elementary_fb="no"
-want_elementary_fb="auto"
-AC_ARG_ENABLE([ecore-fb],
-   [AC_HELP_STRING([--disable-ecore-fb], [disable ecore-fb support. @<:@default=detect@:>@])],
-   [want_elementary_fb=$enableval], [])
-
-if test "x$want_elementary_fb" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_FB],
-      [ecore-fb >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary])
-       have_elementary_fb="yes"
-       requirement_elm="ecore-fb >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_fb="no"]
-   )
-else
-    have_elementary_fb="no"
-fi
-if test "x$want_elementary_fb" = "xyes" -a "x$have_elementary_fb" = "xno"; then
-    AC_MSG_ERROR([ecore-fb support requested, but ecore-fb was not found by pkg-config.])
-fi
-
-have_elementary_psl1ght="no"
-want_elementary_psl1ght="auto"
-AC_ARG_ENABLE([ecore-psl1ght],
-   [AC_HELP_STRING([--disable-ecore-psl1ght], [disable ecore-psl1ght support. @<:@default=detect@:>@])],
-   [want_elementary_psl1ght=$enableval], [])
-
-if test "x$want_elementary_psl1ght" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_PSL1GHT],
-      [ecore-psl1ght >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_PSL1GHT, 1, [PSL1GHT support for Elementary])
-       have_elementary_psl1ght="yes"
-       requirement_elm="ecore-psl1ght >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_psl1ght="no"]
-   )
-else
-    have_elementary_psl1ght="no"
-fi
-if test "x$want_elementary_psl1ght" = "xyes" -a "x$have_elementary_psl1ght" = "xno"; then
-    AC_MSG_ERROR([ecore-psl1ght support requested, but ecore-psl1ght was not found by pkg-config.])
-fi
-
-have_elementary_sdl="no"
-want_elementary_sdl="auto"
-AC_ARG_ENABLE([ecore-sdl],
-   [AC_HELP_STRING([--disable-ecore-sdl], [disable ecore-sdl support. @<:@default=detect@:>@])],
-   [want_elementary_sdl=$enableval], [])
-
-if test "x$want_elementary_sdl" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_SDL],
-      [ecore-sdl >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_SDL, 1, [SDL support for Elementary])
-       have_elementary_sdl="yes"
-       requirement_elm="ecore-sdl >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_sdl="no"]
-   )
-else
-    have_elementary_sdl="no"
-fi
-if test "x$want_elementary_sdl" = "xyes" -a "x$have_elementary_sdl" = "xno"; then
-    AC_MSG_ERROR([ecore-sdl support requested, but ecore-sdl was not found by pkg-config.])
-fi
-
-have_elementary_cocoa="no"
-want_elementary_cocoa="auto"
-AC_ARG_ENABLE([ecore-cocoa],
-   [AC_HELP_STRING([--disable-ecore-cocoa], [disable ecore-cocoa support. @<:@default=detect@:>@])],
-   [want_elementary_cocoa=$enableval], [])
-
-if test "x$want_elementary_cocoa" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_COCOA],
-      [ecore-cocoa >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_COCOA, 1, [COCOA support for Elementary])
-       have_elementary_cocoa="yes"
-       requirement_elm="ecore-cocoa >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_cocoa="no"]
-   )
-else
-    have_elementary_cocoa="no"
-fi
-if test "x$want_elementary_cocoa" = "xyes" -a "x$have_elementary_cocoa" = "xno"; then
-    AC_MSG_ERROR([ecore-cocoa support requested, but ecore-cocoa was not found by pkg-config.])
-fi
-
-have_elementary_win32="no"
-want_elementary_win32="auto"
-AC_ARG_ENABLE([ecore-win32],
-   [AC_HELP_STRING([--disable-ecore-win32], [disable ecore-win32 support. @<:@default=detect@:>@])],
-   [want_elementary_win32=$enableval], [])
-
-if test "x$want_elementary_win32" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_WIN32],
-      [ecore-win32 >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_WIN32, 1, [Windows XP support for Elementary])
-       have_elementary_win32="yes"
-       requirement_elm="ecore-win32 >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_win32="no"]
-   )
-else
-    have_elementary_win32="no"
-fi
-if test "x$want_elementary_win32" = "xyes" -a "x$have_elementary_win32" = "xno"; then
-    AC_MSG_ERROR([ecore-win32 support requested, but ecore-win32 was not found by pkg-config.])
-fi
-
-have_elementary_wayland="no"
-want_elementary_wayland="auto"
-AC_ARG_ENABLE([ecore-wayland],
-   [AC_HELP_STRING([--disable-ecore-wayland], [disable ecore-wayland support. @<:@default=detect@:>@])],
-   [want_elementary_wayland=$enableval], [])
-
-if test "x$want_elementary_wayland" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_WAYLAND],
-      [ecore-wayland],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_WAYLAND, 1, [Wayland support for Elementary])
-       have_elementary_wayland="yes"
-       requirement_elm="ecore-wayland ${requirement_elm}"
-      ],
-      [have_elementary_wayland="no"]
-   )
-else
-    have_elementary_wayland="no"
-fi
-if test "x$want_elementary_wayland" = "xyes" -a "x$have_elementary_wayland" = "xno"; then
-    AC_MSG_ERROR([ecore-wayland support requested, but ecore-wayland was not found by pkg-config.])
-fi
-
-have_elementary_drm="no"
-want_elementary_drm="auto"
-AC_ARG_ENABLE([ecore-drm],
-   [AC_HELP_STRING([--disable-ecore-drm], [disable ecore-drm support. @<:@default=detect@:>@])],
-   [want_elementary_drm=$enableval], [])
-
-if test "x$want_elementary_drm" != "xno"; then
-   PKG_CHECK_MODULES([ELEMENTARY_DRM],
-      [ecore-drm >= efl_version],
-      [
-       AC_DEFINE(HAVE_ELEMENTARY_DRM, 1, [DRM support for Elementary])
-       have_elementary_drm="yes"
-       requirement_elm="ecore-drm >= efl_version ${requirement_elm}"
-      ],
-      [have_elementary_drm="no"]
-   )
-else
-    have_elementary_drm="no"
-fi
-if test "x$want_elementary_drm" = "xyes" -a "x$have_elementary_drm" = "xno"; then
-    AC_MSG_ERROR([ecore-drm support requested, but ecore-drm was not found by pkg-config.])
-fi
-
 
 ELM_ELOCATION_DEF="#undef"
 have_elementary_elocation="no"
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index 3fd2ccf2c..508b250d0 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -13,9 +13,6 @@ AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DDOCW_DIR=\"$(abs_top_builddir)/doc/widgets\" \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
diff --git a/m4/elm_check_backend.m4 b/m4/elm_check_backend.m4
new file mode 100644
index 000000000..476f60924
--- /dev/null
+++ b/m4/elm_check_backend.m4
@@ -0,0 +1,38 @@
+
+dnl use: ELM_CHECK_BACKEND(engine)
+AC_DEFUN([ELM_CHECK_BACKEND],
+[dnl
+m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
+m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
+
+have_elementary_[]DOWN="no"
+
+AC_ARG_ENABLE([ecore-]DOWN,
+   [AC_HELP_STRING([--disable-ecore-]DOWN, [disable ecore-]DOWN[ support. @<:@default=detect@:>@])],
+   [want_backend=$enableval],
+   [want_backend="auto"])
+
+AC_MSG_CHECKING([whether to enable $1 backend])
+AC_MSG_RESULT([${want_backend}])
+
+if test "x${want_backend}" != "xno"; then
+   PKG_CHECK_EXISTS([ecore-]DOWN[ >= efl_version],
+      [
+       AC_DEFINE([HAVE_ELEMENTARY_]UP, [1], [$1 support for Elementary])
+       have_elementary_[]DOWN="yes"
+       requirement_elm="ecore-[]DOWN >= efl_version ${requirement_elm}"
+      ],
+      [have_elementary_]DOWN[="no"]
+   )
+fi
+
+AC_MSG_CHECKING([whether to build $1 backend])
+AC_MSG_RESULT([${have_elementary_[]DOWN}])
+
+if test "x${want_backend}" = "xyes" && test "x$have_elementary_[]DOWN" = "xno"; then
+    AC_MSG_ERROR([ecore-]DOWN[ support requested, but ecore-]DOWN[ was not found by pkg-config.])
+fi
+
+m4_popdef([UP])dnl
+m4_popdef([DOWN])dnl
+])
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index b86dc2db6..8d5c842d6 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -11,16 +11,10 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_SDL_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@ \
-@ELEMENTARY_DRM_CFLAGS@
+@ELEMENTARY_EMAP_CFLAGS@
 
 bin_PROGRAMS = \
 @ELEMENTARY_TEST_PRG@ \
@@ -139,13 +133,11 @@ test_win_dialog.c \
 test.h
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
-        @ELEMENTARY_WAYLAND_LIBS@ \
 	@ELEMENTARY_EWEATHER_LIBS@ \
 	@ELEMENTARY_ELOCATION_LIBS@ \
 	@ELEMENTARY_EMAP_LIBS@ \
 	@ELEMENTARY_LIBS@ \
 	@ELEMENTARY_WEB_LIBS@ \
-	@ELEMENTARY_DRM_LIBS@ \
 	@my_libs@
 elementary_test_CFLAGS =
 elementary_test_LDFLAGS =
@@ -154,13 +146,11 @@ elementary_config_SOURCES = \
 config.c
 
 elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
-        @ELEMENTARY_WAYLAND_LIBS@ \
 	@ELEMENTARY_EWEATHER_LIBS@ \
 	@ELEMENTARY_ELOCATION_LIBS@ \
 	@ELEMENTARY_EMAP_LIBS@ \
 	@ELEMENTARY_LIBS@ \
 	@ELEMENTARY_WEB_LIBS@ \
-	@ELEMENTARY_DRM_LIBS@ \
 	@my_libs@
 elementary_config_LDFLAGS =
 
@@ -169,13 +159,11 @@ elementary_codegen.c
 
 elementary_codegen_LDADD = \
 	$(top_builddir)/src/lib/libelementary.la \
-        @ELEMENTARY_WAYLAND_LIBS@ \
+	@ELEMENTARY_LIBS@ \
 	@ELEMENTARY_EWEATHER_LIBS@ \
 	@ELEMENTARY_ELOCATION_LIBS@ \
 	@ELEMENTARY_EMAP_LIBS@ \
-	@ELEMENTARY_LIBS@ \
 	@ELEMENTARY_WEB_LIBS@ \
-	@ELEMENTARY_DRM_LIBS@ \
 	@my_libs@
 elementary_codegen_LDFLAGS =
 
@@ -197,13 +185,11 @@ $(top_builddir)/src/lib/libelementary.la \
 if BUILD_QUICKLAUNCH
 elementary_quicklaunch_SOURCES = quicklaunch.c
 elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
-        @ELEMENTARY_WAYLAND_LIBS@ \
+	@ELEMENTARY_LIBS@ \
 	@ELEMENTARY_EWEATHER_LIBS@ \
 	@ELEMENTARY_ELOCATION_LIBS@ \
 	@ELEMENTARY_EMAP_LIBS@ \
-	@ELEMENTARY_LIBS@ \
 	@ELEMENTARY_WEB_LIBS@ \
-	@ELEMENTARY_DRM_LIBS@ \
 	@my_libs@
 elementary_quicklaunch_LDFLAGS =
 
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index 59c61de2b..cbdf2be39 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -11,14 +11,9 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@ \
-@ELEMENTARY_DRM_CFLAGS@
+@ELEMENTARY_WEB_CFLAGS@
 
 pkgdir = $(libdir)/edje/modules/elm/$(MODULE_EDJE)
 pkg_LTLIBRARIES = module.la
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 6cb703ae1..8d147214a 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -19,14 +19,13 @@ AM_CPPFLAGS = \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
+@ELEMENTARY_WEB_CFLAGS@ \
 @ELEMENTARY_CFLAGS@
 
 LDADD = \
 @ELEMENTARY_LIBS@ \
 @ELEMENTARY_ELOCATION_LIBS@ \
 @ELEMENTARY_EMAP_LIBS@ \
-@ELEMENTARY_X_LIBS@ \
 $(top_builddir)/src/lib/libelementary.la
 
 ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@
@@ -316,7 +315,6 @@ box_cxx_example_02_CXXFLAGS = \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_CXX_CFLAGS@
 endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fb285d70f..24fbc3921 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -24,16 +24,10 @@ AM_CPPFLAGS = \
 -DICON_DIR=\"$(datadir)/icons\" \
 -DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_SDL_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@ \
-@ELEMENTARY_DRM_CFLAGS@
+@ELEMENTARY_EMAP_CFLAGS@
 
 lib_LTLIBRARIES = libelementary.la
 
@@ -511,15 +505,10 @@ libelementary_la_CFLAGS =
 libelementary_la_LIBADD = \
 @my_libs@ \
 @ELEMENTARY_LIBS@ \
-@ELEMENTARY_X_LIBS@ \
-@ELEMENTARY_FB_LIBS@ \
-@ELEMENTARY_SDL_LIBS@ \
-@ELEMENTARY_WIN32_LIBS@ \
 @ELEMENTARY_ELOCATION_LIBS@ \
+@ELEMENTARY_EWEATHER_LIBS@ \
 @ELEMENTARY_WEB_LIBS@ \
 @ELEMENTARY_EMAP_LIBS@ \
-@ELEMENTARY_WAYLAND_LIBS@ \
-@ELEMENTARY_DRM_LIBS@ \
 @LTLIBINTL@
 
 libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index 84cd94f4f..bfda49a0b 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -11,15 +11,10 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_SDL_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@
+@ELEMENTARY_EMAP_CFLAGS@
 
 pkgdir = $(pkglibdir)/modules/access_output/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index dcf48e476..f44cd714a 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -12,17 +12,10 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_SDL_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_DRM_CFLAGS@
+@ELEMENTARY_EMAP_CFLAGS@
 
 pkgdir = $(pkglibdir)/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index ab11da632..b3991127e 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -24,14 +24,9 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_SDL_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@
+@ELEMENTARY_EMAP_CFLAGS@
 
 pkgdir = $(pkglibdir)/modules/prefs/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index 473866a1c..7b8b40568 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -11,15 +11,10 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_SDL_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@
+@ELEMENTARY_EMAP_CFLAGS@
 
 pkgdir = $(pkglibdir)/modules/test_entry/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 9aa21c6dc..15299c5e0 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -11,15 +11,10 @@ AM_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
-@ELEMENTARY_X_CFLAGS@ \
-@ELEMENTARY_FB_CFLAGS@ \
-@ELEMENTARY_SDL_CFLAGS@ \
-@ELEMENTARY_WIN32_CFLAGS@ \
 @ELEMENTARY_ELOCATION_CFLAGS@ \
 @ELEMENTARY_EWEATHER_CFLAGS@ \
 @ELEMENTARY_WEB_CFLAGS@ \
-@ELEMENTARY_EMAP_CFLAGS@ \
-@ELEMENTARY_WAYLAND_CFLAGS@
+@ELEMENTARY_EMAP_CFLAGS@
 
 pkgdir = $(pkglibdir)/modules/test_map/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 6c97ce634..14bae8f8b 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -80,15 +80,10 @@ elm_suite_CPPFLAGS = \
 	-I$(top_builddir)/src/lib \
 	@CHECK_CFLAGS@ \
 	@ELEMENTARY_CFLAGS@ \
-	@ELEMENTARY_X_CFLAGS@ \
-	@ELEMENTARY_FB_CFLAGS@ \
-	@ELEMENTARY_SDL_CFLAGS@ \
-	@ELEMENTARY_WIN32_CFLAGS@ \
 	@ELEMENTARY_ELOCATION_CFLAGS@ \
 	@ELEMENTARY_EWEATHER_CFLAGS@ \
 	@ELEMENTARY_WEB_CFLAGS@ \
-	@ELEMENTARY_EMAP_CFLAGS@ \
-	@ELEMENTARY_WAYLAND_CFLAGS@
+	@ELEMENTARY_EMAP_CFLAGS@
 
 elm_suite_LDADD = \
 	$(top_builddir)/src/lib/libelementary.la \
@@ -111,16 +106,11 @@ elm_cxx_suite_CPPFLAGS = \
 	-I$(top_builddir)/src/lib \
 	@CHECK_CFLAGS@ \
 	@ELEMENTARY_CFLAGS@ \
-	@ELEMENTARY_X_CFLAGS@ \
 	@ELEMENTARY_CXX_CFLAGS@ \
-	@ELEMENTARY_FB_CFLAGS@ \
-	@ELEMENTARY_SDL_CFLAGS@ \
-	@ELEMENTARY_WIN32_CFLAGS@ \
 	@ELEMENTARY_ELOCATION_CFLAGS@ \
 	@ELEMENTARY_EWEATHER_CFLAGS@ \
 	@ELEMENTARY_WEB_CFLAGS@ \
-	@ELEMENTARY_EMAP_CFLAGS@ \
-	@ELEMENTARY_WAYLAND_CFLAGS@
+	@ELEMENTARY_EMAP_CFLAGS@
 
 elm_cxx_suite_LDADD = \
 	$(top_builddir)/src/lib/libelementary.la \