diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2010-10-31 14:24:39 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2010-10-31 14:24:39 -0400 |
commit | 0bfb126e593c255dd24b464abd92dd8e39d99437 (patch) | |
tree | 4bc7a4cf8d8613ee3b115938753547e141a415ce | |
parent | 1b6c0ed95a8b9c98bca0728cdf56159cc57fec45 (diff) |
Add /wayland so we pick up generated header files
Reported by Benjamin Franzke.
-rw-r--r-- | clients/Makefile.am | 5 | ||||
-rw-r--r-- | 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 = \ |