summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2014-08-29 19:32:33 +0200
committerTom Hacohen <tom@stosb.com>2014-09-02 10:29:50 +0100
commitb19ee318d451bb9337d11f4bc93c9d249a05cc07 (patch)
treef1e30eef9a5c6f60d55efd924c91a08a17503702 /src/modules
parent2a1bc688a94583af71ce44a3db0b1d403590b23d (diff)
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.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/access_output/Makefile.am5
-rw-r--r--src/modules/datetime_input_ctxpopup/Makefile.am5
-rw-r--r--src/modules/prefs/Makefile.am5
-rw-r--r--src/modules/test_entry/Makefile.am5
-rw-r--r--src/modules/test_map/Makefile.am5
5 files changed, 5 insertions, 20 deletions
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index 72906902e..cfd9646fd 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DELEMENTARY_BUILD \
12@ELEMENTARY_CFLAGS@ \ 13@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 14@ELEMENTARY_X_CFLAGS@ \
14@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
@@ -20,10 +21,6 @@ AM_CPPFLAGS = \
20@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ 22@ELEMENTARY_WAYLAND_CFLAGS@
22 23
23if ELEMENTARY_WINDOWS_BUILD
24AM_CPPFLAGS += -DELEMENTARY_BUILD
25endif
26
27pkgdir = $(libdir)/elementary/modules/access_output/$(MODULE_ARCH) 24pkgdir = $(libdir)/elementary/modules/access_output/$(MODULE_ARCH)
28pkg_LTLIBRARIES = module.la 25pkg_LTLIBRARIES = module.la
29 26
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index 3fe00e2b1..ddf10b5cc 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -10,6 +10,7 @@ AM_CPPFLAGS = \
10-I$(top_builddir)/src/lib \ 10-I$(top_builddir)/src/lib \
11-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ 11-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
12-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 12-DPACKAGE_LIB_DIR=\"$(libdir)\" \
13-DELEMENTARY_BUILD \
13@ELEMENTARY_CFLAGS@ \ 14@ELEMENTARY_CFLAGS@ \
14@ELEMENTARY_X_CFLAGS@ \ 15@ELEMENTARY_X_CFLAGS@ \
15@ELEMENTARY_FB_CFLAGS@ \ 16@ELEMENTARY_FB_CFLAGS@ \
@@ -23,10 +24,6 @@ AM_CPPFLAGS = \
23@ELEMENTARY_EMAP_CFLAGS@ \ 24@ELEMENTARY_EMAP_CFLAGS@ \
24@ELEMENTARY_DRM_CFLAGS@ 25@ELEMENTARY_DRM_CFLAGS@
25 26
26if ELEMENTARY_WINDOWS_BUILD
27AM_CPPFLAGS += -DELEMENTARY_BUILD
28endif
29
30pkgdir = $(libdir)/elementary/modules/datetime_input_ctxpopup/$(MODULE_ARCH) 27pkgdir = $(libdir)/elementary/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
31pkg_LTLIBRARIES = module.la 28pkg_LTLIBRARIES = module.la
32 29
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index d53f1d2e7..49239c38c 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -22,6 +22,7 @@ AM_CPPFLAGS = \
22-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ 22-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
23-DLOCALE_DIR=\"$(localedir)\" \ 23-DLOCALE_DIR=\"$(localedir)\" \
24-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24-DPACKAGE_LIB_DIR=\"$(libdir)\" \
25-DELEMENTARY_BUILD \
25@ELEMENTARY_CFLAGS@ \ 26@ELEMENTARY_CFLAGS@ \
26@ELEMENTARY_X_CFLAGS@ \ 27@ELEMENTARY_X_CFLAGS@ \
27@ELEMENTARY_FB_CFLAGS@ \ 28@ELEMENTARY_FB_CFLAGS@ \
@@ -32,10 +33,6 @@ AM_CPPFLAGS = \
32@ELEMENTARY_EMAP_CFLAGS@ \ 33@ELEMENTARY_EMAP_CFLAGS@ \
33@ELEMENTARY_WAYLAND_CFLAGS@ 34@ELEMENTARY_WAYLAND_CFLAGS@
34 35
35if ELEMENTARY_WINDOWS_BUILD
36AM_CPPFLAGS += -DELEMENTARY_BUILD
37endif
38
39pkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH) 36pkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
40pkg_LTLIBRARIES = module.la 37pkg_LTLIBRARIES = module.la
41 38
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index bf191b8ab..167f660ff 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DELEMENTARY_BUILD \
12@ELEMENTARY_CFLAGS@ \ 13@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 14@ELEMENTARY_X_CFLAGS@ \
14@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
@@ -20,10 +21,6 @@ AM_CPPFLAGS = \
20@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ 22@ELEMENTARY_WAYLAND_CFLAGS@
22 23
23if ELEMENTARY_WINDOWS_BUILD
24AM_CPPFLAGS += -DELEMENTARY_BUILD
25endif
26
27pkgdir = $(libdir)/elementary/modules/test_entry/$(MODULE_ARCH) 24pkgdir = $(libdir)/elementary/modules/test_entry/$(MODULE_ARCH)
28pkg_LTLIBRARIES = module.la 25pkg_LTLIBRARIES = module.la
29 26
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 260cd59f3..01a1fa025 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -9,6 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DELEMENTARY_BUILD \
12@ELEMENTARY_CFLAGS@ \ 13@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 14@ELEMENTARY_X_CFLAGS@ \
14@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
@@ -20,10 +21,6 @@ AM_CPPFLAGS = \
20@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ 22@ELEMENTARY_WAYLAND_CFLAGS@
22 23
23if ELEMENTARY_WINDOWS_BUILD
24AM_CPPFLAGS += -DELEMENTARY_BUILD
25endif
26
27pkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH) 24pkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH)
28pkg_LTLIBRARIES = module.la 25pkg_LTLIBRARIES = module.la
29 26