aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2017-11-08 10:22:10 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2017-11-08 10:22:10 -0800
commitcae5d061849ba0c7150f0089433cceeff2e602be (patch)
tree49f65fcf18f38b2c614a63c3932a1b9c4e0258cd /Makefile.in
parentceeaf11e66d7e1b7ad511446f308337981f71a71 (diff)
downloadnasm-cae5d061849ba0c7150f0089433cceeff2e602be.tar.gz
nasm-cae5d061849ba0c7150f0089433cceeff2e602be.tar.xz
nasm-cae5d061849ba0c7150f0089433cceeff2e602be.zip
More autoconf modernizations; upgrade AC_PREREQ to 2.69
Make further autoconf rule improvements and update the required version of autoconf to 2.69. That version is now 5+ years old and although there might be older versions which have the prerequisite macros they are known to have lots of bugs, and we can't really test them. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in35
1 files changed, 17 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in
index 1913277f..4b4b91f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -449,20 +449,22 @@ golden: nasm$(X)
cd test && $(RUNPERL) performtest.pl --golden --nasm=../nasm *.asm
#
-# Rules to re-run autoconf if necessary
+# Rules to run autoreconf if necessary
#
-config/config.h.in: configure.ac
- autoheader
-
-configure: configure.ac config/config.h.in
- autoconf
+configure: configure.ac aclocal.m4
+ autoreconf
-config.status: configure Makefile.in doc/Makefile.in config/config.h.in
+config.status: configure
+ @if [ ! -f config.status ]; then \
+ echo "*** ERROR: Need to run configure!" 1>&2 ; \
+ exit 1; \
+ fi
sh config.status --recheck
-Makefile: config.status
+Makefile: config.status Makefile.in doc/Makefile.in
+ sh config.status
-doc/Makefile: config.status
+doc/Makefile: Makefile
config/config.h: config.status
@@ -484,7 +486,6 @@ Makefile.dep: $(PERLREQ) tools/mkdep.pl config.status
dep: Makefile.dep
#
-#
# This build dependencies in *ALL* makefiles, and forces all
# dependencies to be inserted inline. For that reason, it should only
# be invoked manually or via "make dist". It should be run before
@@ -497,10 +498,9 @@ alldeps: $(PERLREQ) tools/syncfiles.pl tools/mkdep.pl
$(RM_F) *.dep
if [ -f config.status ]; then \
if [ $(EXTERNAL_DEPENDENCIES) -eq 1 ]; then \
- ./config.status --recheck; \
- else \
- ./config.status; \
- fi \
+ sh config.status --recheck; \
+ fi; \
+ sh config.status; \
fi
# Strip internal dependency information from all Makefiles; this makes
@@ -512,10 +512,9 @@ cleandeps: $(PERLREQ) qtools/syncfiles.pl tools/mkdep.pl
$(RM_F) *.dep
if [ -f config.status ]; then \
if [ $(EXTERNAL_DEPENDENCIES) -eq 0 ]; then \
- ./config.status --recheck; \
- else \
- ./config.status; \
- fi \
+ sh config.status --recheck; \
+ fi; \
+ sh config.status; \
fi
#-- Magic hints to mkdep.pl --#