don't use deprecated INCLUDES variable
authornobled <nobled@dreamwidth.org>
Mon, 24 Jan 2011 16:27:27 +0000 (16:27 +0000)
committernobled <nobled@dreamwidth.org>
Mon, 24 Jan 2011 16:27:27 +0000 (16:27 +0000)
compositor/Makefile.am
wayland/Makefile.am

index 5487f6c..d2baa43 100644 (file)
@@ -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    \
index 1814064..7b3cec4 100644 (file)
@@ -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