[Xfce4-commits] <xfce4-appfinder:xfce-4.10> Autotools updates.

[Nick Schermer]

Updating branch refs/heads/xfce-4.10
         to b98082561f95bce7b0e66c19f0de460f64c7400a (commit)
       from ba30d2697d7c555e39807a8568de4bb9e39e9b8b (commit)

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

    Autotools updates.
    
    (cherry picked from commit 56d59a8d99bcb6810191fbdf8f6e9286c9c66928)

 Makefile.am     |    5 -----
 configure.ac.in |    4 ++--
 src/Makefile.am |    2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ad38f13..a37cad7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,11 +14,6 @@ DISTCLEANFILES = \
 	intltool-merge \
 	intltool-update
 
-AUTOMAKE_OPTIONS = \
-	1.9 \
-	dist-bzip2 \
-	no-dist-gzip
-
 distclean-local:
 	-rm -rf *.cache *~
 
diff --git a/configure.ac.in b/configure.ac.in
index 4d66210..033e481 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -29,8 +29,8 @@ AC_PREREQ([2.60])
 dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
-AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()])
-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/src/Makefile.am b/src/Makefile.am
index 1c08eb9..1e8c543 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
 	-DG_LOG_DOMAIN=\"xfce4-appfinder\" \