diff options
author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-04 18:30:35 -0700 |
---|---|---|
committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-04 18:30:35 -0700 |
commit | d23200584c299e375d4caf0bbd89052bdfeb53c0 (patch) | |
tree | 9a7b51de54402ed37849710b8c4dcde1fcd4faec | |
parent | dc1a6c5306d4a978206b25f9ffbc1827561facd3 (diff) | |
download | nasm-d23200584c299e375d4caf0bbd89052bdfeb53c0.tar.gz |
Makefile: run cleandeps, no need to config.status --recheck
There is no point to run config.status --recheck just because
we have changed Makefile.in. Just run config.status.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | Mkfiles/msvc.mak | 6 | ||||
-rw-r--r-- | Mkfiles/openwcom.mak | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index b510face..2fa561b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -546,9 +546,6 @@ alldeps: $(PERLREQ) tools/syncfiles.pl tools/mkdep.pl $(DEPDIRS) $(RM_F) *.dep if [ -f config.status ]; then \ - if [ $(EXTERNAL_DEPENDENCIES) -eq 1 ]; then \ - sh config.status --recheck; \ - fi; \ sh config.status; \ fi @@ -560,9 +557,6 @@ cleandeps: $(PERLREQ) tools/syncfiles.pl tools/mkdep.pl $(DEPDIRS) $(RM_F) *.dep if [ -f config.status ]; then \ - if [ $(EXTERNAL_DEPENDENCIES) -eq 0 ]; then \ - sh config.status --recheck; \ - fi; \ sh config.status; \ fi diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index 25667a37..09bb42fe 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -73,7 +73,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \ nasmlib\string.$(O) nasmlib\nctype.$(O) \ nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) \ nasmlib\realpath.$(O) nasmlib\path.$(O) \ - nasmlib\filename.$(O) \ + nasmlib\filename.$(O) nasmlib\rlimit.$(O) \ nasmlib\zerobuf.$(O) nasmlib\readnum.$(O) nasmlib\bsi.$(O) \ nasmlib\rbtree.$(O) nasmlib\hashtbl.$(O) \ nasmlib\raa.$(O) nasmlib\saa.$(O) \ @@ -217,7 +217,7 @@ x86\regs.h: x86\regs.dat x86\regs.pl WARNFILES = asm\warnings.c include\warnings.h doc\warnings.src warnings: - rm -f $(WARNFILES) + $(RM_F) $(WARNFILES) $(MAKE) $(WARNFILES) asm\warnings.c: asm\warnings.pl @@ -316,8 +316,6 @@ $(RDFLIB): $(RDFLIBOBJ) #-- Begin NSIS Rules --# # Edit in Makefile.in, not here! -# NSIS is not built except by explicit request, as it only applies to -# Windows platforms nsis\arch.nsh: nsis\getpearch.pl nasm$(X) $(PERL) $(srcdir)\nsis\getpearch.pl nasm$(X) > nsis\arch.nsh diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index 1a0c3d10..d13b780f 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -62,7 +62,7 @@ LIBOBJ = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) & nasmlib\string.$(O) nasmlib\nctype.$(O) & nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) & nasmlib\realpath.$(O) nasmlib\path.$(O) & - nasmlib\filename.$(O) & + nasmlib\filename.$(O) nasmlib\rlimit.$(O) & nasmlib\zerobuf.$(O) nasmlib\readnum.$(O) nasmlib\bsi.$(O) & nasmlib\rbtree.$(O) nasmlib\hashtbl.$(O) & nasmlib\raa.$(O) nasmlib\saa.$(O) & @@ -230,7 +230,7 @@ x86\regs.h: x86\regs.dat x86\regs.pl WARNFILES = asm\warnings.c include\warnings.h doc\warnings.src warnings: - rm -f $(WARNFILES) + $(RM_F) $(WARNFILES) $(MAKE) $(WARNFILES) asm\warnings.c: asm\warnings.pl @@ -282,8 +282,6 @@ perlreq: $(PERLREQ) .SYMBOLIC #-- Begin NSIS Rules --# # Edit in Makefile.in, not here! -# NSIS is not built except by explicit request, as it only applies to -# Windows platforms nsis\arch.nsh: nsis\getpearch.pl nasm$(X) $(PERL) $(srcdir)\nsis\getpearch.pl nasm$(X) > nsis\arch.nsh |