From 2d40555ffa59671c1bddb15696627023a7f92937 Mon Sep 17 00:00:00 2001
From: Nick Schermer <nick@xfce.org>
Date: Sun, 6 Jan 2013 12:19:29 +0100
Subject: [PATCH] Autotools updates.

---
 configure.ac.in                         | 2 +-
 docs/reference/thunarx/Makefile.am      | 2 +-
 examples/tex-open-terminal/Makefile.am  | 2 +-
 plugins/thunar-apr/Makefile.am          | 2 +-
 plugins/thunar-sbr/Makefile.am          | 2 +-
 plugins/thunar-sendto-email/Makefile.am | 2 +-
 plugins/thunar-tpa/Makefile.am          | 2 +-
 plugins/thunar-uca/Makefile.am          | 2 +-
 plugins/thunar-wallpaper/Makefile.am    | 2 +-
 thunar/Makefile.am                      | 2 +-
 thunarx/Makefile.am                     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 84ac30c8d..93629a98c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -49,7 +49,7 @@ dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/docs/reference/thunarx/Makefile.am b/docs/reference/thunarx/Makefile.am
index e25361e54..50b8c217a 100644
--- a/docs/reference/thunarx/Makefile.am
+++ b/docs/reference/thunarx/Makefile.am
@@ -46,7 +46,7 @@ content_files = 							\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =	 							\
+AM_CPPFLAGS =	 							\
 	-I$(top_srcdir) 						\
 	-I$(top_builddir) 						\
 	$(GTK_CFLAGS)							\
diff --git a/examples/tex-open-terminal/Makefile.am b/examples/tex-open-terminal/Makefile.am
index a8cf3cec3..3d09e4d4f 100644
--- a/examples/tex-open-terminal/Makefile.am
+++ b/examples/tex-open-terminal/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/examples					\
diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am
index 2b358a964..472228a1a 100644
--- a/plugins/thunar-apr/Makefile.am
+++ b/plugins/thunar-apr/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
 	-I$(top_srcdir)							\
diff --git a/plugins/thunar-sbr/Makefile.am b/plugins/thunar-sbr/Makefile.am
index 9e4ed6654..e905c9e5c 100644
--- a/plugins/thunar-sbr/Makefile.am
+++ b/plugins/thunar-sbr/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
 	-I$(top_srcdir)							\
diff --git a/plugins/thunar-sendto-email/Makefile.am b/plugins/thunar-sendto-email/Makefile.am
index 935b1f3e7..f82473917 100644
--- a/plugins/thunar-sendto-email/Makefile.am
+++ b/plugins/thunar-sendto-email/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
 	-I$(top_srcdir)							\
diff --git a/plugins/thunar-tpa/Makefile.am b/plugins/thunar-tpa/Makefile.am
index f3880e55d..063b7066c 100644
--- a/plugins/thunar-tpa/Makefile.am
+++ b/plugins/thunar-tpa/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
 	-I$(top_srcdir)							\
diff --git a/plugins/thunar-uca/Makefile.am b/plugins/thunar-uca/Makefile.am
index dea653798..5f966e068 100644
--- a/plugins/thunar-uca/Makefile.am
+++ b/plugins/thunar-uca/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/plugins					\
 	-I$(top_srcdir)							\
diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am
index 06fe36f8b..894662278 100644
--- a/plugins/thunar-wallpaper/Makefile.am
+++ b/plugins/thunar-wallpaper/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"thunar-wallpaper-plugin\"			\
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index f0a4042d3..04846de3d 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -1,6 +1,6 @@
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DBINDIR=\"$(bindir)\"						\
diff --git a/thunarx/Makefile.am b/thunarx/Makefile.am
index f0c2fcd28..1e522bf01 100644
--- a/thunarx/Makefile.am
+++ b/thunarx/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"thunarx\"					\
 	-DTHUNARX_COMPILATION						\
-- 
GitLab