kwo pushed a commit to branch master.
commit d943d1ebea09b04b7b65b56d57a3fe1e8dcb7127
Author: Kim Woelders <[email protected]>
Date: Sat Mar 23 19:19:37 2013 +0100
Change INCLUDES to AM_CPPFLAGS.
INCLUDES is deprecated.
---
src/bin/Makefile.am | 2 +-
src/lib/Makefile.am | 2 +-
src/modules/filters/Makefile.am | 10 +++++-----
src/modules/loaders/Makefile.am | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 7695c3b..3779e8f 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = \
+AM_CPPFLAGS = \
-I../lib \
-I$(top_srcdir)/src/lib \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a4a76f1..51a7212 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = @my_includes@ -I. -I$(top_srcdir) -I$(top_builddir)
-DPACKAGE_LIB_DIR=\"$(libdir)\"
+AM_CPPFLAGS = @my_includes@ -I. -I$(top_srcdir) -I$(top_builddir)
-DPACKAGE_LIB_DIR=\"$(libdir)\"
# Older automakes (<1.10) do not use INCLUDES when compiling .S files
AM_CCASFLAGS = -I$(top_builddir)
diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am
index cad057b..c85217a 100644
--- a/src/modules/filters/Makefile.am
+++ b/src/modules/filters/Makefile.am
@@ -1,12 +1,12 @@
MAINTAINERCLEANFILES = Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
- -I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/modules/filters \
- @my_includes@
-
+ -I$(top_srcdir)/src/lib \
+ -I$(top_srcdir)/src/modules/filters \
+ @my_includes@
+
pkgdir = $(libdir)/imlib2/filters
pkg_LTLIBRARIES = testfilter.la bumpmap.la colormod.la
diff --git a/src/modules/loaders/Makefile.am b/src/modules/loaders/Makefile.am
index 62005d9..e2b892a 100644
--- a/src/modules/loaders/Makefile.am
+++ b/src/modules/loaders/Makefile.am
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
AUTOMAKE_OPTIONS = 1.4 foreign
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules/loaders \
@@ -54,7 +54,7 @@ jpeg_la_LIBADD = @JPEGLIBS@
$(top_builddir)/src/lib/libImlib2.la
jpeg_la_LIBTOOLFLAGS = --tag=disable-static
png_la_SOURCES = loader_png.c
-png_la_CPPFLAGS = @PNG_CFLAGS@
+png_la_CPPFLAGS = @PNG_CFLAGS@ $(AM_CPPFLAGS)
png_la_LDFLAGS = -module -avoid-version
png_la_LIBADD = @PNG_LIBS@ $(top_builddir)/src/lib/libImlib2.la
png_la_LIBTOOLFLAGS = --tag=disable-static
--
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
