aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:04:38 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:04:38 -0700
commit57c375305cf14265bb5ef468bef25cf465a4382a (patch)
tree408d675b39fb179a5e2883704643e0340d0779f5
parenta825b33423d5046dfc4c0992c3ebfea5b8a531c4 (diff)
downloadnasm-57c375305cf14265bb5ef468bef25cf465a4382a.tar.gz
nasm-57c375305cf14265bb5ef468bef25cf465a4382a.tar.xz
nasm-57c375305cf14265bb5ef468bef25cf465a4382a.zip
Makefile: add warnings.src to perlreq; longer list of binary files
Add warnings.src to PERLREQ. If this isn't done, warnings.src ends up in the xdoc tarball rather than the release tarball, which means that unless the user can "make warnings" manually (which requires Perl) then they can't build the documentation. As this only affects the documentation build, it probably does not warrant a point release. Add a few more extensions to the list of recognized binary extensions for the purpose of generating a .zip file with DOS line ending conventions. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
-rw-r--r--Makefile.in5
-rw-r--r--Mkfiles/msvc.mak2
-rw-r--r--Mkfiles/openwcom.mak2
-rwxr-xr-xtools/release2
4 files changed, 6 insertions, 5 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
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index f004e984..d0272b2b 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -143,7 +143,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
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 82ce05ac..73e0d1bc 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -156,7 +156,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
diff --git a/tools/release b/tools/release
index 16e35811..f353425a 100755
--- a/tools/release
+++ b/tools/release
@@ -66,7 +66,7 @@ mv nasm-"$version".tar.gz nasm-"$version".tar.bz2 nasm-"$version".tar.xz ..
# Create zipfile (DOS convention: no prefix, convert file endings)
cd nasm-"$version"
-binext='jpg zip ico png pdf bin o obj exe com'
+binext='jpg zip ico png pdf bin o obj exe com a lib xz'
for e in $binext; do
xbin="$xbin -x *.$e -x *.$e.t"
ibin="$ibin -i *.$e -i *.$e.t"