From 0bfb126e593c255dd24b464abd92dd8e39d99437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Sun, 31 Oct 2010 14:24:39 -0400 Subject: [PATCH] Add /wayland so we pick up generated header files Reported by Benjamin Franzke. --- clients/Makefile.am | 5 ++++- compositor/Makefile.am | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/clients/Makefile.am b/clients/Makefile.am index d1e71341..7bdc5c39 100644 --- a/clients/Makefile.am +++ b/clients/Makefile.am @@ -1,7 +1,10 @@ noinst_PROGRAMS = gears flower screenshot terminal image view dnd smoke noinst_LTLIBRARIES = libtoytoolkit.la -INCLUDES = -I$(top_srcdir)/wayland $(CLIENT_CFLAGS) $(POPPLER_CFLAGS) +INCLUDES = \ + -I$(top_srcdir)/wayland \ + -I$(top_builddir)/wayland \ + $(CLIENT_CFLAGS) $(POPPLER_CFLAGS) LDADD = libtoytoolkit.la \ $(top_builddir)/wayland/libwayland-client.la \ diff --git a/compositor/Makefile.am b/compositor/Makefile.am index a7d121bf..cef3965d 100644 --- a/compositor/Makefile.am +++ b/compositor/Makefile.am @@ -1,6 +1,10 @@ noinst_PROGRAMS = compositor -INCLUDES = -I$(top_srcdir)/wayland $(COMPOSITOR_CFLAGS) +INCLUDES = \ + -I$(top_srcdir)/wayland \ + -I$(top_builddir)/wayland \ + $(COMPOSITOR_CFLAGS) + AM_CPPFLAGS = -DDATADIR='"$(datadir)"' compositor_LDADD = \