From 7d9517855ab5d7acfda262c6e960ab96b7ce6b9c Mon Sep 17 00:00:00 2001 From: nobled Date: Mon, 24 Jan 2011 16:01:26 +0000 Subject: [PATCH 1/2] fix includes --- clients/Makefile.am | 2 +- compositor/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/Makefile.am b/clients/Makefile.am index 84d29d0..9839b84 100644 --- a/clients/Makefile.am +++ b/clients/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 = \ diff --git a/compositor/Makefile.am b/compositor/Makefile.am index 89ea443..5487f6c 100644 --- a/compositor/Makefile.am +++ b/compositor/Makefile.am @@ -1,8 +1,8 @@ noinst_PROGRAMS = compositor INCLUDES = \ - -I$(top_srcdir)/wayland \ -I$(top_builddir)/wayland \ + -I$(top_srcdir)/wayland \ $(COMPOSITOR_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS) From 0428a9a15c58c14963a1a0eec245aa75389ebfe4 Mon Sep 17 00:00:00 2001 From: nobled Date: Mon, 24 Jan 2011 16:27:27 +0000 Subject: [PATCH 2/2] don't use deprecated INCLUDES variable --- compositor/Makefile.am | 4 ++-- wayland/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compositor/Makefile.am b/compositor/Makefile.am index 5487f6c..d2baa43 100644 --- a/compositor/Makefile.am +++ b/compositor/Makefile.am @@ -1,12 +1,12 @@ noinst_PROGRAMS = compositor -INCLUDES = \ +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 \ diff --git a/wayland/Makefile.am b/wayland/Makefile.am index 1814064..7b3cec4 100644 --- a/wayland/Makefile.am +++ b/wayland/Makefile.am @@ -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