Updating branch refs/heads/master
to 398726e4bc760800a47190780c6f21ede170079f (commit)
from 347a41904e1147b238504ea1c2f2786e00413361 (commit)
commit 398726e4bc760800a47190780c6f21ede170079f
Author: Nick Schermer <[email protected]>
Date: Sun Jan 6 12:19:11 2013 +0100
Autotools updates.
Makefile.am | 5 -----
configure.ac.in | 4 ++--
docs/Makefile.am | 2 +-
glade/Makefile.am | 2 +-
libxfce4kbd-private/Makefile.am | 2 +-
libxfce4ui/Makefile.am | 2 +-
xfce4-about/Makefile.am | 2 +-
7 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f724684..2137de4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,6 @@ SUBDIRS = \
docs \
po
-AUTOMAKE_OPTIONS = \
- 1.9 \
- dist-bzip2 \
- no-dist-gzip
-
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 f5fcc52..e47df04 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -40,8 +40,8 @@ AC_CANONICAL_TARGET()
dnl ***************************
dnl *** Initialize automake ***
dnl ***************************
-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/docs/Makefile.am b/docs/Makefile.am
index 944f834..881316f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -45,7 +45,7 @@ content_files =
\
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(LIBXFCE4UTIL_CFLAGS) \
diff --git a/glade/Makefile.am b/glade/Makefile.am
index b19e357..4ae8cd8 100644
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -1,6 +1,6 @@
# $Id$
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"libxfce4ui-glade\" \
$(PLATFORM_CPPFLAGS)
diff --git a/libxfce4kbd-private/Makefile.am b/libxfce4kbd-private/Makefile.am
index e5cca7c..36dcc75 100644
--- a/libxfce4kbd-private/Makefile.am
+++ b/libxfce4kbd-private/Makefile.am
@@ -2,7 +2,7 @@
if ENABLE_KEYBOARD_LIBRARY
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DDATADIR=\"$(datadir)\" \
diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index d70f161..3d35fdd 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -1,6 +1,6 @@
# $Id$
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DDATADIR=\"$(datadir)\" \
-DSN_API_NOT_YET_FROZEN \
diff --git a/xfce4-about/Makefile.am b/xfce4-about/Makefile.am
index 7234dd9..c326990 100644
--- a/xfce4-about/Makefile.am
+++ b/xfce4-about/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"xfce4-about\" \
-DDATADIR=\"$(datadir)/xfce4\" \
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
