diff options
author | H. Peter Anvin <hpa@zytor.com> | 2017-04-03 10:33:12 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2017-04-03 10:33:12 -0700 |
commit | 526a6c73904e9f07ee63dd76db06bd6687c4c849 (patch) | |
tree | ccf37a2d70ebbb10e0a48a3a965b7452e58ba943 | |
parent | 5253f58c3679b9b21006567ad26a419904791645 (diff) | |
download | nasm-526a6c73904e9f07ee63dd76db06bd6687c4c849.tar.gz |
Rename insns-iflags.pl -> insns-iflags.ph, add missing dependency
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>
-rw-r--r-- | Makefile.in | 20 | ||||
-rw-r--r-- | Mkfiles/msvc.mak | 4 | ||||
-rw-r--r-- | Mkfiles/openwcom.mak | 4 | ||||
-rw-r--r-- | x86/insns-iflags.ph (renamed from x86/insns-iflags.pl) | 0 | ||||
-rw-r--r-- | x86/insns.dat | 2 | ||||
-rwxr-xr-x | x86/insns.pl | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 2e833f55..07a0fe08 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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 diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak index ee003937..6a1f59d1 100644 --- a/Mkfiles/msvc.mak +++ b/Mkfiles/msvc.mak @@ -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 diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak index b88e0172..358da7f6 100644 --- a/Mkfiles/openwcom.mak +++ b/Mkfiles/openwcom.mak @@ -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 diff --git a/x86/insns-iflags.pl b/x86/insns-iflags.ph index 84eda8f5..84eda8f5 100644 --- a/x86/insns-iflags.pl +++ b/x86/insns-iflags.ph diff --git a/x86/insns.dat b/x86/insns.dat index 82d31034..c91f13fb 100644 --- a/x86/insns.dat +++ b/x86/insns.dat @@ -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. diff --git a/x86/insns.pl b/x86/insns.pl index 73390949..e6d3eee1 100755 --- a/x86/insns.pl +++ b/x86/insns.pl @@ -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! |