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

[Nick Schermer]

Updating branch refs/heads/master
         to 1f4b089e83508749dc9ca41a0a5a2c16c2bb3d01 (commit)
       from 14fd91f5ead718594b4a76e80f088977631d7be4 (commit)

commit 1f4b089e83508749dc9ca41a0a5a2c16c2bb3d01
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 6 12:19:16 2013 +0100

    Autotools updates.

 Makefile.am                        |    5 -----
 configure.in.in => configure.ac.in |    4 ++--
 libxfce4util/Makefile.am           |    2 +-
 xfce4-kiosk-query/Makefile.am      |    2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1c0c8da..e7be4ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,6 @@ SUBDIRS =								\
 	po								\
 	xfce4-kiosk-query
 
-AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2							\
-	no-dist-gzip
-
 distclean-local:
 	rm -rf *.cache *~
 
diff --git a/configure.in.in b/configure.ac.in
similarity index 98%
rename from configure.in.in
rename to configure.ac.in
index 4f6cf45..41aceff 100644
--- a/configure.in.in
+++ b/configure.ac.in
@@ -47,8 +47,8 @@ dnl ***************************
 dnl *** Initialize automake ***
 dnl ***************************
 LIBXFCE4UTIL_VERSION=libxfce4util_version()
-AM_INIT_AUTOMAKE([libxfce4util], [$LIBXFCE4UTIL_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/libxfce4util/Makefile.am b/libxfce4util/Makefile.am
index 1e1ac7c..9ea0f9b 100644
--- a/libxfce4util/Makefile.am
+++ b/libxfce4util/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DDEFAULT_XDG_CACHE_HOME=\"~/.cache\"				\
 	-DDEFAULT_XDG_DATA_HOME=\"~/.local/share\"			\
diff --git a/xfce4-kiosk-query/Makefile.am b/xfce4-kiosk-query/Makefile.am
index e35e7ef..8c2f2fd 100644
--- a/xfce4-kiosk-query/Makefile.am
+++ b/xfce4-kiosk-query/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)