Updating branch refs/heads/xfce-4.10 to e5890495a6cd8a46a6d6562db9d1ba37b6a01d21 (commit) from fe4e53c01ae6abf5ade75cd9089965d32afa104b (commit)
commit e5890495a6cd8a46a6d6562db9d1ba37b6a01d21 Author: Nick Schermer <n...@xfce.org> Date: Sun Jan 6 12:20:55 2013 +0100 Autotools updates. (cherry picked from commit 76fdbcb57170a44a2c2981bd401607fc82de7f86) configure.ac.in | 4 ++-- dialogs/accessibility-settings/Makefile.am | 2 +- dialogs/appearance-settings/Makefile.am | 2 +- dialogs/display-settings/Makefile.am | 2 +- dialogs/keyboard-settings/Makefile.am | 2 +- dialogs/mime-settings/Makefile.am | 2 +- dialogs/mouse-settings/Makefile.am | 2 +- xfce4-settings-editor/Makefile.am | 2 +- xfce4-settings-manager/Makefile.am | 2 +- xfsettingsd/Makefile.am | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 4605996..d322c11 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -34,8 +34,8 @@ AC_REVISION([@REVISION@]) dnl *************************** dnl *** Initialize automake *** dnl *************************** -AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) -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/dialogs/accessibility-settings/Makefile.am b/dialogs/accessibility-settings/Makefile.am index bf16b70..9d65670 100644 --- a/dialogs/accessibility-settings/Makefile.am +++ b/dialogs/accessibility-settings/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ diff --git a/dialogs/appearance-settings/Makefile.am b/dialogs/appearance-settings/Makefile.am index 9839581..ce32e91 100644 --- a/dialogs/appearance-settings/Makefile.am +++ b/dialogs/appearance-settings/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ diff --git a/dialogs/display-settings/Makefile.am b/dialogs/display-settings/Makefile.am index c768893..2e910d8 100644 --- a/dialogs/display-settings/Makefile.am +++ b/dialogs/display-settings/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ diff --git a/dialogs/keyboard-settings/Makefile.am b/dialogs/keyboard-settings/Makefile.am index 3cc0a5d..2994354 100644 --- a/dialogs/keyboard-settings/Makefile.am +++ b/dialogs/keyboard-settings/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DDATADIR=\"$(datadir)\" \ -DBINDIR=\"$(bindir)\" \ diff --git a/dialogs/mime-settings/Makefile.am b/dialogs/mime-settings/Makefile.am index dd548a3..4755f49 100644 --- a/dialogs/mime-settings/Makefile.am +++ b/dialogs/mime-settings/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DBINDIR=\"$(bindir)\" \ -DLOCALEDIR=\"$(localedir)\" \ diff --git a/dialogs/mouse-settings/Makefile.am b/dialogs/mouse-settings/Makefile.am index 3975905..53de6ab 100644 --- a/dialogs/mouse-settings/Makefile.am +++ b/dialogs/mouse-settings/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ diff --git a/xfce4-settings-editor/Makefile.am b/xfce4-settings-editor/Makefile.am index fd272d1..63c2d0e 100644 --- a/xfce4-settings-editor/Makefile.am +++ b/xfce4-settings-editor/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DLOCALEDIR=\"$(localedir)\" \ -DG_LOG_DOMAIN=\"xfce4-settings-editor\" \ diff --git a/xfce4-settings-manager/Makefile.am b/xfce4-settings-manager/Makefile.am index c6bdc2d..85eb12c 100644 --- a/xfce4-settings-manager/Makefile.am +++ b/xfce4-settings-manager/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DMENUFILE=\"$(sysconfdir)/xdg/menus/xfce-settings-manager.menu\" \ -DLOCALEDIR=\"$(localedir)\" \ diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am index 1b2dabe..e289ab7 100644 --- a/xfsettingsd/Makefile.am +++ b/xfsettingsd/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = \ +AM_CPPFLAGS = \ -I${top_srcdir} \ -DDATADIR=\"$(datadir)\" \ -DBINDIR=\"$(bindir)\" \ _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits