summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2023-09-07 18:56:40 +0200
committerMarcel Holtmann <marcel@holtmann.org>2023-09-07 18:56:40 +0200
commita964d0a1be5e5c18a1a3b2075f305aae4c24edf3 (patch)
tree34c74a849f9cf5e886b1dc5df01043fd4ac623ea
parent8dc5d5ba381512ad5b1afa45c63ec6b0a3833244 (diff)
downloadsbc-a964d0a1be5e5c18a1a3b2075f305aae4c24edf3.tar.gz
build: Use build-aux directory for autoconf files
-rw-r--r--Makefile.am5
-rwxr-xr-xbootstrap10
-rw-r--r--configure.ac5
3 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index 2f8bd80..176e2cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
AM_MAKEFLAGS = --no-print-directory
+ACLOCAL_AMFLAGS = -I build-aux
+
# Library code modified: REVISION++
# Interfaces changed: CURRENT++ REVISION=0
# Interfaces added: CURRENT++ REVISION=0 AGE++
@@ -67,3 +69,6 @@ EXTRA_DIST = sbc/sbc.sym
MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 configure config.h.in config.sub config.guess \
ltmain.sh depcomp compile missing install-sh mkinstalldirs
+
+maintainer-clean-local:
+ -rm -rf build-aux
diff --git a/bootstrap b/bootstrap
index 91756f9..aee4c08 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
#!/bin/sh
-aclocal && \
- autoheader && \
- libtoolize --automake --copy --force && \
- automake --add-missing --copy && \
- autoconf
+if [ ! -d build-aux ]; then
+ mkdir build-aux
+fi
+
+autoreconf --force --install --symlink
diff --git a/configure.ac b/configure.ac
index a3bc7c5..9e2d097 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,12 @@
AC_PREREQ([2.69])
AC_INIT([sbc], [2.0])
+AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR(build-aux)
+
AM_INIT_AUTOMAKE([foreign subdir-objects color-tests silent-rules
tar-pax no-dist-gzip dist-xz])
-AC_CONFIG_HEADERS(config.h)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])