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

[Nick Schermer]

Updating branch refs/heads/xfce-4.10
         to 22d083fc8dd6f49a230625c1758a654d2f138f08 (commit)
       from b9726ea92ced234666c147d9da1fb106632297d3 (commit)

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

    Autotools updates.
    
    (cherry picked from commit 6a1e12ffe71c2807e6d889b1520821afdb663320)

 Makefile.am                        |    4 ----
 configure.in.in => configure.ac.in |    4 ++--
 libxfsm/Makefile.am                |    2 +-
 xfce4-session/Makefile.am          |    2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7825ae1..082a0cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,10 +32,6 @@ DISTCLEANFILES =							\
 	intltool-update							\
 	$(desktop_DATA)
 
-AUTOMAKE_OPTIONS =							\
-	1.8								\
-	dist-bzip2
-
 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 9aa4f8f..7057616 100644
--- a/configure.in.in
+++ b/configure.ac.in
@@ -27,8 +27,8 @@ AC_REVISION([$Id$])
 AC_PROG_MAKE_SET()
 
 dnl Initialize automake
-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/libxfsm/Makefile.am b/libxfsm/Makefile.am
index 92082dd..b219933 100644
--- a/libxfsm/Makefile.am
+++ b/libxfsm/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)
 
 # common library
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index c015154..18ead0d 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)							\
 	-DG_LOG_DOMAIN=\"xfce4-session\"				\