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

[Nick Schermer]

Updating branch refs/heads/xfce-4.10
         to 52e1ecd35ef750fbb86bd5b91b8030325a46bc9d (commit)
       from 406ef4963d89aba8abadb79dae3f32a5b2addd9e (commit)

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

    Autotools updates.
    
    (cherry picked from commit 97d495593969d43f3d5b5fb26357c3e5a6d8ea71)

 configure.ac.in              |    5 ++---
 helper-dialog/Makefile.am    |    2 +-
 settings-dialogs/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index dbf4fc0..9aa2617 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -26,10 +26,9 @@ AC_COPYRIGHT([Copyright (c) 2002-2011
 
 Written for Xfce by Olivier Fourdan <fourdan at xfce.org>.])
 AC_INIT([xfwm4], [xfwm4_version], [xfce4-dev at xfce.org])
-AM_INIT_AUTOMAKE([xfwm4], [xfwm4_version()])
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip])
 
-AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AM_MAINTAINER_MODE()
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/helper-dialog/Makefile.am b/helper-dialog/Makefile.am
index 0dd8930..eb696a1 100644
--- a/helper-dialog/Makefile.am
+++ b/helper-dialog/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	$(GTK_CFLAGS) 							\
 	$(LIBXFCE4UTIL_CFLAGS)						\
 	$(LIBX11_CFLAGS)						\
diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
index b2b1485..424c482 100644
--- a/settings-dialogs/Makefile.am
+++ b/settings-dialogs/Makefile.am
@@ -75,7 +75,7 @@ xfwm4_tweaks_settings_LDADD = \
 	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCONF_LIBS)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I${top_srcdir}
 
 if MAINTAINER_MODE