diff options
| author | Nick Schermer <nick@xfce.org> | 2013-01-06 12:19:16 +0100 |
|---|---|---|
| committer | Nick Schermer <nick@xfce.org> | 2013-05-04 16:32:51 +0200 |
| commit | c849553db6f361a95917f1a9c6ff58194ccf2f14 (patch) | |
| tree | 6e7e8d45fc812488b76a091d1d229663587c8d71 | |
| parent | 85c891ae80f3ca6d87f682ba957dbf9bf3eb8bf0 (diff) | |
| download | libxfce4util-c849553db6f361a95917f1a9c6ff58194ccf2f14.tar.gz | |
Autotools updates.
(cherry picked from commit 1f4b089e83508749dc9ca41a0a5a2c16c2bb3d01)
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac.in (renamed from configure.in.in) | 4 | ||||
| -rw-r--r-- | libxfce4util/Makefile.am | 2 | ||||
| -rw-r--r-- | xfce4-kiosk-query/Makefile.am | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 1c0c8da..e7be4ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,11 +6,6 @@ SUBDIRS = \ po \ xfce4-kiosk-query -AUTOMAKE_OPTIONS = \ - 1.8 \ - dist-bzip2 \ - no-dist-gzip - distclean-local: rm -rf *.cache *~ diff --git a/configure.in.in b/configure.ac.in index 4f6cf45..41aceff 100644 --- a/configure.in.in +++ b/configure.ac.in @@ -47,8 +47,8 @@ dnl *************************** dnl *** Initialize automake *** dnl *************************** LIBXFCE4UTIL_VERSION=libxfce4util_version() -AM_INIT_AUTOMAKE([libxfce4util], [$LIBXFCE4UTIL_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/libxfce4util/Makefile.am b/libxfce4util/Makefile.am index 1e1ac7c..9ea0f9b 100644 --- a/libxfce4util/Makefile.am +++ b/libxfce4util/Makefile.am @@ -1,6 +1,6 @@ # $Id$ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -DDEFAULT_XDG_CACHE_HOME=\"~/.cache\" \ -DDEFAULT_XDG_DATA_HOME=\"~/.local/share\" \ diff --git a/xfce4-kiosk-query/Makefile.am b/xfce4-kiosk-query/Makefile.am index e35e7ef..8c2f2fd 100644 --- a/xfce4-kiosk-query/Makefile.am +++ b/xfce4-kiosk-query/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) |