mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Clean up -DDATADIR in makefiles

Browse Source 
Now only libshared (and libshared_cairo) requires this.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Derek Foreman
2018-02-06 15:18:39 -06:00
committed by Pekka Paalanen
parent e277276b85
commit b809d79d99
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
+6 -4
View File
@@ -50,7 +50,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/tests \ -I$(top_builddir)/tests \
-I$(top_srcdir)/shared \ -I$(top_srcdir)/shared \
-I$(top_builddir)/protocol \ -I$(top_builddir)/protocol \
-DDATADIR='"$(datadir)"' \
-DLIBWESTON_MODULEDIR='"$(libweston_moduledir)"' \ -DLIBWESTON_MODULEDIR='"$(libweston_moduledir)"' \
-DLIBEXECDIR='"$(libexecdir)"' \ -DLIBEXECDIR='"$(libexecdir)"' \
-DBINDIR='"$(bindir)"' -DBINDIR='"$(bindir)"'
@@ -951,7 +950,6 @@ desktop_shell_la_CPPFLAGS = \
-I$(top_builddir)/libweston \ -I$(top_builddir)/libweston \
-I$(top_srcdir)/libweston \ -I$(top_srcdir)/libweston \
-I$(top_builddir)/desktop-shell \ -I$(top_builddir)/desktop-shell \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
-DLIBEXECDIR='"$(libexecdir)"' \ -DLIBEXECDIR='"$(libexecdir)"' \
-DIN_WESTON -DIN_WESTON
@@ -1081,7 +1079,6 @@ xwayland_la_CPPFLAGS = \
-I$(top_builddir)/libweston \ -I$(top_builddir)/libweston \
-I$(top_srcdir)/libweston \ -I$(top_srcdir)/libweston \
-I$(top_builddir)/xwayland \ -I$(top_builddir)/xwayland \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \ -DMODULEDIR='"$(moduledir)"' \
-DLIBEXECDIR='"$(libexecdir)"' -DLIBEXECDIR='"$(libexecdir)"'
@@ -1118,6 +1115,10 @@ endif
noinst_LTLIBRARIES += libshared.la libshared-cairo.la \ noinst_LTLIBRARIES += libshared.la libshared-cairo.la \
libzunitc.la libzunitcmain.la libzunitc.la libzunitcmain.la
libshared_la_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \
$(AM_CPPFLAGS)
libshared_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) libshared_la_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS)
libshared_la_SOURCES = \ libshared_la_SOURCES = \
@@ -1132,8 +1133,9 @@ libshared_la_SOURCES = \
shared/xalloc.c \ shared/xalloc.c \
shared/xalloc.h shared/xalloc.h
libshared_cairo_la_CPPFLAGS = $(libshared_la_CPPFLAGS)
libshared_cairo_la_CFLAGS = \ libshared_cairo_la_CFLAGS = \
-DDATADIR='"$(datadir)"' \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(COMPOSITOR_CFLAGS) \ $(COMPOSITOR_CFLAGS) \
$(PIXMAN_CFLAGS) \ $(PIXMAN_CFLAGS) \