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

[Nick Schermer]

Updating branch refs/heads/master
         to 8392598a7a549370a37c1d7a59cd64c4ca7a9329 (commit)
       from acfabda23c5ab32161a2e26aa413d370fc7cf7ea (commit)

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

    Autotools updates.

 Makefile.am     |    4 ----
 configure.ac.in |    5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9731cfa..7ea2a60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,10 +25,6 @@ DISTCLEANFILES = \
 	intltool-merge \
 	intltool-update
 
-AUTOMAKE_OPTIONS = \
-	1.8 \
-	dist-bzip2
-
 distuninstallcheck_listfiles = \
 	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
 
diff --git a/configure.ac.in b/configure.ac.in
index 3df4929..8a4c309 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -31,9 +31,8 @@ AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/])
 AC_PREREQ([2.50])
 
 dnl init automake
-XFDESKTOP_VERSION=xfdesktop_version
-AM_INIT_AUTOMAKE([xfdesktop], [$XFDESKTOP_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])])