Autotools updates.

(cherry picked from commit d4c4c5a745db93acb341879ec18adcc795df8507)

18 files changed, 18 insertions, 18 deletions

diff --git a/common/Makefile.am b/common/Makefile.am
index 18fecf34..dd2d971e 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libpanel-common\" \
 	-DLIBXFCE4PANEL_COMPILATION \
diff --git a/configure.ac.in b/configure.ac.in
index 6b3f4db8..80d909e3 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -39,7 +39,7 @@ AC_REVISION([xfce4_panel_version_build])
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar])
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/docs/references/Makefile.am b/docs/references/Makefile.am
index 8db2c09d..e760d3fd 100644
--- a/docs/references/Makefile.am
+++ b/docs/references/Makefile.am
@@ -43,7 +43,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/libxfce4panel/Makefile.am b/libxfce4panel/Makefile.am
index 29c3f8b4..cba5083f 100644
--- a/libxfce4panel/Makefile.am
+++ b/libxfce4panel/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libxfce4panel\" \
 	-DLIBXFCE4PANEL_COMPILATION \
diff --git a/migrate/Makefile.am b/migrate/Makefile.am
index d0e695b6..9cb9d2ca 100644
--- a/migrate/Makefile.am
+++ b/migrate/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"xfce4-panel-migrate\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
diff --git a/panel/Makefile.am b/panel/Makefile.am
index 672272b0..a19453d4 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"xfce4-panel\" \
 	-DDATADIR=\"$(datadir)/xfce4\" \
diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index ddad9909..b6492157 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libactions\" \
 	$(PLATFORM_CPPFLAGS)
diff --git a/plugins/applicationsmenu/Makefile.am b/plugins/applicationsmenu/Makefile.am
index 06892470..d0d94bff 100644
--- a/plugins/applicationsmenu/Makefile.am
+++ b/plugins/applicationsmenu/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libapplicationsmenu\" \
 	$(PLATFORM_CPPFLAGS)
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 923fb33c..1878115e 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libclock\" \
 	$(PLATFORM_CPPFLAGS)
diff --git a/plugins/directorymenu/Makefile.am b/plugins/directorymenu/Makefile.am
index 0aa46b88..88b13eaf 100644
--- a/plugins/directorymenu/Makefile.am
+++ b/plugins/directorymenu/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libdirectorymenu\" \
 	$(PLATFORM_CPPFLAGS)
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index e7029dbc..5841dc7b 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"liblauncher\" \
 	-DSN_API_NOT_YET_FROZEN \
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index ceb1ea74..7730391d 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libpager\" \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index 1312aab4..77b6449a 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libseparator\" \
 	$(PLATFORM_CPPFLAGS)
diff --git a/plugins/showdesktop/Makefile.am b/plugins/showdesktop/Makefile.am
index 37c6f74a..6180434b 100644
--- a/plugins/showdesktop/Makefile.am
+++ b/plugins/showdesktop/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libshowdesktop\" \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 01db738f..8c8c9489 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libsystray\" \
 	$(PLATFORM_CPPFLAGS)
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index 4d9c5931..4f386f39 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libtasklist\" \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 88f7bf25..a1836839 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"libwindowmenu\" \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 39815876..94bb13ab 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"xfce4-panel-wrapper\" \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \