Autotools updates.

diff --git a/configure.ac.in b/configure.ac.in
index 84ac30c..93629a9 100644 (file)
--- 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 e25361e..50b8c21 100644 (file)
--- 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 a8cf3ce..3d09e4d 100644 (file)
--- 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 2b358a9..472228a 100644 (file)
--- 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 9e4ed66..e905c9e 100644 (file)
--- 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 935b1f3..f824739 100644 (file)
--- 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 f3880e5..063b706 100644 (file)
--- 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 dea6537..5f966e0 100644 (file)
--- 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 06fe36f..8946622 100644 (file)
--- 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 f0a4042..04846de 100644 (file)
--- 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 f0c2fcd..1e522bf 100644 (file)
--- 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                                           \