aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
commitc59337797f2dac6c89c66440f3d30d468adf5bbc (patch)
tree56b3769fce933ffbcf2180124f925465acbd6043 /Makefile.in
parent513e19c8da06745525492b58795d8d8caa545049 (diff)
parent444905e48bc2e4e428064b3ad5ec6d6c5d23d2f1 (diff)
downloadnasm-master.tar.gz
nasm-master.tar.xz
nasm-master.zip
Merge remote-tracking branch 'origin/nasm-2.15.xx'HEADmaster
Resolved Conflicts: version Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index dd4bf09f..8c8e1d54 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -184,7 +184,7 @@ PERLREQ = x86/insnsb.c x86/insnsa.c x86/insnsd.c x86/insnsi.h x86/insnsn.c \
x86/iflag.c x86/iflaggen.h \
macros/macros.c \
asm/pptok.ph asm/directbl.c asm/directiv.h \
- asm/warnings.c include/warnings.h \
+ asm/warnings.c include/warnings.h doc/warnings.src \
version.h version.mac version.mak nsis/version.nsh
INSDEP = x86/insns.dat x86/insns.pl x86/insns-iflags.ph x86/iflags.ph
@@ -393,7 +393,8 @@ clean:
distclean: clean
$(RM_F) config.log config.status config/config.h
for d in . $(SUBDIRS) $(XSUBDIRS); do \
- $(RM_F) "$$d"/*~ "$$d"/*.bak "$$d"/*.lst "$$d"/*.bin ; \
+ $(RM_F) "$$d"/.\# "$$d"/\# "$$d"/*~ "$$d"/*.bak \
+ "$$d"/*.lst "$$d"/*.bin ; \
done
$(RM_F) test/*.$(O)
$(RM_RF) autom4te*.cache