[Xfce4-commits] <xfconf:master> Autotools updates.

[Nick Schermer]

Updating branch refs/heads/master
         to 3801fd3f5967a7b5a651f7f1954bca87dbc4d1ab (commit)
       from 7948aeff791dd7acc276431938a3446ad85469f3 (commit)

commit 3801fd3f5967a7b5a651f7f1954bca87dbc4d1ab
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 6 12:20:30 2013 +0100

    Autotools updates.

 common/Makefile.am         |    2 +-
 configure.ac.in            |    4 ++--
 docs/reference/Makefile.am |    2 +-
 xfconf-query/Makefile.am   |    2 +-
 xfconf/Makefile.am         |    2 +-
 xfconfd/Makefile.am        |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index c81491b..5ee7b74 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DLIBXFCONF_COMPILATION \
 	-DG_LOG_DOMAIN=\"xfconf-common\" \
diff --git a/configure.ac.in b/configure.ac.in
index c362ada..056ab92 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -23,8 +23,8 @@ AC_INIT([xfconf], [xfconf_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
 
 dnl init automake
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 3d1b33b..32b0195 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -52,7 +52,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) \
 	$(GLIB_CFLAGS) \
diff --git a/xfconf-query/Makefile.am b/xfconf-query/Makefile.am
index eec8346..61f2887 100644
--- a/xfconf-query/Makefile.am
+++ b/xfconf-query/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"xfconf-query\" \
 	-DDATADIR=\"$(datadir)\" \
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am
index 9277263..af1d3b5 100644
--- a/xfconf/Makefile.am
+++ b/xfconf/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DLIBXFCONF_COMPILATION \
 	-DG_LOG_DOMAIN=\"xfconf\" \
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 0cdc450..6983c58 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DG_LOG_DOMAIN=\"xfconfd\" \
 	-DLIBXFCONF_COMPILATION \