diff options
author | Stephen Webb <swebb@blackberry.com> | 2022-08-10 09:57:09 -0400 |
---|---|---|
committer | Stephen M. Webb <stephen.webb@bregmasoft.ca> | 2022-08-13 11:00:06 -0400 |
commit | 778dc30fbfc9da43e9637dd06ea4d019eae0e1bd (patch) | |
tree | a83fd23745536f02f60653cb8d58b2abf713a92f | |
parent | 9afaef970b69c8f7e9194bb9956ba57215e97a4a (diff) | |
download | libunwind-778dc30fbfc9da43e9637dd06ea4d019eae0e1bd.tar.gz |
Stop the autotools nag about AC_CONFIG_MACRO_DIRS
All warnings should be heeded, including the ones spat out by autoreconf. In
this case, autoconf wanted a place to generate its m4 files into and automake
wanted the right target names in doc/Makefile.am.
Also added AM_SILENT_FILES([yes]) to reduce the visual noise in build output to
make spotting build problems easier. You can override the silent default by
running `make` with `V=0` appended to the command line.
Removed the unnecessary and unused acinclude.m4 file to reduce clutter in the
source directory.
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | acinclude.m4 | 1 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | doc/Makefile.am | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 718e8dad..0d5eee05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +ACLOCAL_AMFLAGS = -I m4 include_HEADERS = include/libunwind-dynamic.h if BUILD_PTRACE diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 8b137891..00000000 --- a/acinclude.m4 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/configure.ac b/configure.ac index f535c86c..b3be39d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,18 @@ +dnl Process this file with autoconf to produce a configure script. + define(pkg_major, 1) define(pkg_minor, 6) define(pkg_extra, -rc1) define(pkg_maintainer, libunwind-devel@nongnu.org) define(mkvers, $1.$2$3) -dnl Process this file with autoconf to produce a configure script. + AC_INIT([libunwind],[mkvers(pkg_major, pkg_minor, pkg_extra)],[pkg_maintainer]) AC_CONFIG_SRCDIR(src/mi/backtrace.c) AC_CONFIG_AUX_DIR(config) +AC_CONFIG_MACRO_DIRS([m4]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([1.6 subdir-objects]) +AM_INIT_AUTOMAKE([1.6 subdir-objects -Wall]) +AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE AC_CONFIG_HEADERS([include/config.h]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 8a654b32..2252978d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -66,16 +66,16 @@ L2M_CMD = $(L2M) -t $(srcdir)/libunwind.trans L2H_CMD = $(L2M) -H -t $(srcdir)/libunwind.trans .tex.man: - $(L2M_CMD) $< $@ + $(AM_V_GEN)$(L2M_CMD) $< $@ -cp $@ $(srcdir)/$@ -html: +html-local: for n in $(man3_MANS); do \ page=`basename $$n .man`; \ $(L2H_CMD) $(srcdir)/$$page.tex "$$page(3).raw"; \ done -pdf: +pdf-local: for n in $(man3_MANS); do \ page=`basename $$n .man`; \ $(L2P) $(srcdir)/$$page.tex "$$page(3).pdf"; \ |