enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

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.
This commit is contained in:
Vincent Torri 2014-08-29 19:32:33 +02:00 committed by Tom Hacohen
parent ea99904b1d
commit 8a48ea85e9
7 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/src/edje_externals/Makefile.am
View File

@ -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

5
legacy/elementary/src/lib/Makefile.am
View File

@ -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 = \

5
legacy/elementary/src/modules/access_output/Makefile.am
View File

@ -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

5
legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am
View File

@ -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

5
legacy/elementary/src/modules/prefs/Makefile.am
View File

@ -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

5
legacy/elementary/src/modules/test_entry/Makefile.am
View File

@ -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

5
legacy/elementary/src/modules/test_map/Makefile.am
View File

@ -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