Makefiles: ELEMENTARY_BUILD is only defined on windows, no need to check.

Use ELEMENTARY_BUILD in CPP flags as it will be used only on Windows anyway.

diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index 8357b73..59c61de 100644 (file)
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_FB_CFLAGS@ \
@@ -19,10 +20,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_WAYLAND_CFLAGS@ \
 @ELEMENTARY_DRM_CFLAGS@
 
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
 pkgdir = $(libdir)/edje/modules/elm/$(MODULE_EDJE)
 pkg_LTLIBRARIES = module.la
 

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4b4ca84..3038a71 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
 -DLOCALE_DIR=\"$(localedir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DICON_DIR=\"$(datadir)/icons\" \
+-DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_FB_CFLAGS@ \
@@ -34,10 +35,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_WAYLAND_CFLAGS@ \
 @ELEMENTARY_DRM_CFLAGS@
 
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
 lib_LTLIBRARIES = libelementary.la
 
 includes_HEADERS = \

diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index 7290690..cfd9646 100644 (file)
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_FB_CFLAGS@ \
@@ -20,10 +21,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EMAP_CFLAGS@ \
 @ELEMENTARY_WAYLAND_CFLAGS@
 
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
 pkgdir = $(libdir)/elementary/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 3fe00e2..ddf10b5 100644 (file)
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_FB_CFLAGS@ \
@@ -23,10 +24,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EMAP_CFLAGS@ \
 @ELEMENTARY_DRM_CFLAGS@
 
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
 pkgdir = $(libdir)/elementary/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 d53f1d2..49239c3 100644 (file)
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DLOCALE_DIR=\"$(localedir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_FB_CFLAGS@ \
@@ -32,10 +33,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EMAP_CFLAGS@ \
 @ELEMENTARY_WAYLAND_CFLAGS@
 
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
 pkgdir = $(libdir)/elementary/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 bf191b8..167f660 100644 (file)
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_FB_CFLAGS@ \
@@ -20,10 +21,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EMAP_CFLAGS@ \
 @ELEMENTARY_WAYLAND_CFLAGS@
 
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
 pkgdir = $(libdir)/elementary/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 260cd59..01a1fa0 100644 (file)
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib \
 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
 @ELEMENTARY_CFLAGS@ \
 @ELEMENTARY_X_CFLAGS@ \
 @ELEMENTARY_FB_CFLAGS@ \
@@ -20,10 +21,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EMAP_CFLAGS@ \
 @ELEMENTARY_WAYLAND_CFLAGS@
 
-if ELEMENTARY_WINDOWS_BUILD
-AM_CPPFLAGS += -DELEMENTARY_BUILD
-endif
-
 pkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la