Merge remote branch 'nobled/for-krh'

dev
Kristian Høgsberg 14 years ago
commit 4d6ff297c8
  1. 2
      clients/Makefile.am
  2. 6
      compositor/Makefile.am
  3. 2
      wayland/Makefile.am

@ -16,8 +16,8 @@ noinst_LTLIBRARIES = libtoytoolkit.la
AM_CFLAGS = $(GCC_CFLAGS)
AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \
-I$(top_srcdir)/wayland \
-I$(top_builddir)/wayland \
-I$(top_srcdir)/wayland \
$(CLIENT_CFLAGS)
libtoytoolkit_la_SOURCES = \

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

@ -29,7 +29,7 @@ libwayland_client_la_SOURCES = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wayland-client.pc wayland-server.pc
INCLUDES = $(FFI_CFLAGS)
AM_CPPFLAGS = $(FFI_CFLAGS)
AM_CFLAGS = $(GCC_CFLAGS)
include $(top_srcdir)/wayland/scanner.mk

Loading…
Cancel
Save