procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename insns-iflags.pl -> insns-iflags.ph, add missing dependency

Browse source 
insns-iflags.ph is included from another Perl script, so rename it .ph
(Perl header).  Add missing dependency to the main Makefile.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2017-04-03 10:33:12 -07:00
parent 5253f58c36
commit 526a6c7390
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile.in
View file

@ -132,6 +132,15 @@ LIBOBJ = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
SUBDIRS = stdlib nasmlib output asm disasm x86 common macros
XSUBDIRS = test doc nsis
# Perl-generated source files
PERLREQ = x86/insnsb.c x86/insnsa.c x86/insnsd.c x86/insnsi.h x86/insnsn.c \
x86/regs.c x86/regs.h x86/regflags.c x86/regdis.c x86/regdis.h \
x86/regvals.c asm/tokhash.c asm/tokens.h asm/pptok.h asm/pptok.c \
x86/iflag.c x86/iflaggen.h \
macros/macros.c \
asm/pptok.ph asm/directbl.c asm/directiv.h \
version.h version.mac version.mak nsis/version.nsh
#-- End File Lists --#
all: nasm$(X) ndisasm$(X) rdf
@ -153,7 +162,7 @@ ndisasm$(X): $(NDISASM) $(NASMLIB)
# instruction-table file by a Perl script. They're distributed,
# though, so it isn't necessary to have Perl just to recompile NASM
# from the distribution.
INSDEP = x86/insns.dat x86/insns.pl
INSDEP = x86/insns.dat x86/insns.pl x86/insns-iflags.ph
x86/iflag.c: $(INSDEP)
$(RUNPERL) $(srcdir)/x86/insns.pl -fc \
@ -252,15 +261,6 @@ asm/directbl.c: asm/directiv.dat nasmlib/perfhash.pl perllib/phash.ph
$(RUNPERL) $(srcdir)/nasmlib/perfhash.pl c \
$(srcdir)/asm/directiv.dat asm/directbl.c
# This target generates all files that require perl.
# This allows easier generation of distribution (see dist target).
PERLREQ = x86/insnsb.c x86/insnsa.c x86/insnsd.c x86/insnsi.h x86/insnsn.c \
x86/regs.c x86/regs.h x86/regflags.c x86/regdis.c x86/regdis.h \
x86/regvals.c asm/tokhash.c asm/tokens.h asm/pptok.h asm/pptok.c \
x86/iflag.c x86/iflaggen.h \
macros/macros.c \
asm/pptok.ph asm/directbl.c asm/directiv.h \
version.h version.mac version.mak nsis/version.nsh
perlreq: $(PERLREQ)
# NSIS is not built except by explicit request, as it only applies to

4
Mkfiles/msvc.mak
View file

@ -119,9 +119,9 @@ nasm.$(A): $(LIBOBJ)
# though, so it isn't necessary to have Perl just to recompile NASM
# from the distribution.
insns.pl: insns-iflags.pl
insns.pl: insns-iflags.ph
INSDEP = insns.dat insns.pl insns-iflags.pl
INSDEP = insns.dat insns.pl insns-iflags.ph
iflag.c: $(INSDEP)
$(PERL) $(srcdir)/insns.pl -fc $(srcdir)/insns.dat

4
Mkfiles/openwcom.mak
View file

@ -137,9 +137,9 @@ nasm.lib: $(LIBOBJ)
# though, so it isn't necessary to have Perl just to recompile NASM
# from the distribution.
insns.pl: insns-iflags.pl
insns.pl: insns-iflags.ph
INSDEP = x86/insns.dat x86/insns.pl x86/insns-iflags.pl
INSDEP = x86/insns.dat x86/insns.pl x86/insns-iflags.ph
x86/iflag.c: $(INSDEP)
$(PERL) $(srcdir)/x86/insns.pl -fc $(srcdir)/x86/insns.dat x86/iflag.c

0
x86/insns-iflags.pl → x86/insns-iflags.ph
View file

2
x86/insns.dat
View file

@ -41,7 +41,7 @@
;
; For a detailed description of the code string (third field), please
; see insns.pl and the comment at the top of assemble.c. For a detailed
; description of the flags (fourth field), please see insns-iflags.pl.
; description of the flags (fourth field), please see insns-iflags.ph.
;
; Comments with a pound sign after the semicolon generate section
; subheaders in the NASM documentation.

2
x86/insns.pl
View file

@ -37,7 +37,7 @@
#
# Parse insns.dat and produce generated source code files
require 'x86/insns-iflags.pl';
require 'x86/insns-iflags.ph';
# Opcode prefixes which need their own opcode tables
# LONGER PREFIXES FIRST!