summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--acinclude.m41
-rw-r--r--configure.ac8
-rw-r--r--doc/Makefile.am6
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"; \