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

Merge remote branch 'nobled/for-krh'

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-01-25 10:17:16 -05:00
parent 70af98c576 0428a9a15c
commit 4d6ff297c8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/Makefile.am
+1 -1
View File
@@ -16,8 +16,8 @@ noinst_LTLIBRARIES = libtoytoolkit.la
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \ -DDATADIR='"$(datadir)"' \
-I$(top_srcdir)/wayland \
-I$(top_builddir)/wayland \ -I$(top_builddir)/wayland \
-I$(top_srcdir)/wayland \
$(CLIENT_CFLAGS) $(CLIENT_CFLAGS)
libtoytoolkit_la_SOURCES = \ libtoytoolkit_la_SOURCES = \
compositor/Makefile.am
+3 -3
View File
@@ -1,12 +1,12 @@
noinst_PROGRAMS = compositor noinst_PROGRAMS = compositor
INCLUDES = \ AM_CPPFLAGS = \
-I$(top_srcdir)/wayland \ -DDATADIR='"$(datadir)"' \
-I$(top_builddir)/wayland \ -I$(top_builddir)/wayland \
-I$(top_srcdir)/wayland \
$(COMPOSITOR_CFLAGS) $(COMPOSITOR_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = -DDATADIR='"$(datadir)"'
compositor_LDADD = \ compositor_LDADD = \
$(top_builddir)/wayland/libwayland-server.la \ $(top_builddir)/wayland/libwayland-server.la \
wayland/Makefile.am
+1 -1
View File
@@ -29,7 +29,7 @@ libwayland_client_la_SOURCES = \
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wayland-client.pc wayland-server.pc pkgconfig_DATA = wayland-client.pc wayland-server.pc
INCLUDES = $(FFI_CFLAGS) AM_CPPFLAGS = $(FFI_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS)
include $(top_srcdir)/wayland/scanner.mk include $(top_srcdir)/wayland/scanner.mk