diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2014-12-18 09:52:12 +0100 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2014-12-18 09:52:12 +0100 |
| commit | 06de19f8dfc76c4aed0c6f811f4e38e3c3e1e469 (patch) | |
| tree | 5d7f1291cacab0b8778af18b012d349852ae3bde | |
| parent | 78e2efa4269102955950dc5a8b4af33365260ce2 (diff) | |
Update obsolete gnome-common and automake macros
- Drop obsolete GNOME_COMMON_INIT, we already set ACLOCAL_AMFLAGS.
- Drop GNOME_MAINTAINER_MODE_DEFINES, we already configure maintainer mode.
- Replace obsolete GNOME_DEBUG_CHECK with AX_CHECK_ENABLE_DEBUG.
- Replace obsolete INCLUDES with AM_CPPFLAGS.
Bump automake dependency to 1.11.
https://bugs.freedesktop.org/show_bug.cgi?id=73321
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | udisks/Makefile.am | 3 |
6 files changed, 12 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index e3125cb..74dfa08 100644 --- a/configure.ac +++ b/configure.ac @@ -16,30 +16,26 @@ AC_SUBST(UDISKS_MINOR_VERSION) AC_SUBST(UDISKS_MICRO_VERSION) AC_SUBST(UDISKS_VERSION) -AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([1.11 foreign silent-rules dist-bzip2 no-dist-gzip]) +AM_MAINTAINER_MODE +AM_SILENT_RULES([yes]) + AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src]) AC_CONFIG_HEADERS([config.h]) -AM_MAINTAINER_MODE +AX_CHECK_ENABLE_DEBUG AC_PROG_CC AC_ISC_POSIX AC_HEADER_STDC AC_PROG_LIBTOOL -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -# Initialization +# Compilation # -GNOME_COMMON_INIT -GNOME_DEBUG_CHECK GNOME_COMPILE_WARNINGS([maximum]) -GNOME_MAINTAINER_MODE_DEFINES - -# Compilation -# CC_CHECK_CFLAGS_APPEND([ \ -Waggregate-return \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 24fd20c..472a06d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -25,7 +25,7 @@ IGNORE_HFILES= \ # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir) \ -I$(top_builddir) \ diff --git a/src/Makefile.am b/src/Makefile.am index fc44c75..1b12c37 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ NULL = EXTRA_DIST = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) -I$(top_srcdir) \ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 3c01087..b80c5f4 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST = \ integration-test \ $(NULL) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) -I$(top_srcdir) \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 392f06e..7f775e7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,7 +2,7 @@ NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) -I$(top_srcdir) \ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ diff --git a/udisks/Makefile.am b/udisks/Makefile.am index c1d440e..dd16efe 100644 --- a/udisks/Makefile.am +++ b/udisks/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = NULL = -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) -I$(top_srcdir) \ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ @@ -86,6 +86,7 @@ libudisks2_la_SOURCES = \ libudisks2_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"libudisks2\" \ + $(AM_CPPFLAGS) \ $(NULL) libudisks2_la_CFLAGS = \ |