Merge remote branch 'nobled/for-krh'

This commit is contained in:
Kristian Høgsberg 2011-01-25 10:17:16 -05:00
commit 4d6ff297c8
3 changed files with 5 additions and 5 deletions

View file

@ -1,12 +1,12 @@
noinst_PROGRAMS = compositor
INCLUDES = \
-I$(top_srcdir)/wayland \
AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \
-I$(top_builddir)/wayland \
-I$(top_srcdir)/wayland \
$(COMPOSITOR_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = -DDATADIR='"$(datadir)"'
compositor_LDADD = \
$(top_builddir)/wayland/libwayland-server.la \