Makefiles: distribute file generation rules via syncfiles.pl

Distribute the file generation rules to auxiliary Makefiles via
syncfiles.pl.  These rules are OS- and Make-dialect-generic enough
that our mangling script handles them well enough.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2 files changed, 209 insertions, 110 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 6a1f59d1..9860d9c9 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -39,7 +39,8 @@ INTERNAL_CFLAGS = /I$(srcdir) /I. \
 ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LDFLAGS		= $(LDFLAGS) /SUBSYSTEM:CONSOLE /RELEASE
 LIBS		=
-PERL		= perl -I$(srcdir)/perllib -I$(srcdir)
+PERL		= perl
+PERL		= $(PERL) -I$(srcdir)/perllib -I$(srcdir)
 
 # Binary suffixes
 O               = obj
@@ -114,94 +115,141 @@ ndisasm$(X): $(NDISASM) nasm.$(A)
 nasm.$(A): $(LIBOBJ)
 	$(AR) $(ARFLAGS) /OUT:$@ $**
 
-# These source files are automagically generated from a single
-# 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.
-
-insns.pl: insns-iflags.ph
-
-INSDEP = insns.dat insns.pl insns-iflags.ph
-
-iflag.c: $(INSDEP)
-	$(PERL) $(srcdir)/insns.pl -fc $(srcdir)/insns.dat
-iflaggen.h: $(INSDEP)
-	$(PERL) $(srcdir)/insns.pl -fh $(srcdir)/insns.dat
-insnsb.c: $(INSDEP)
-	$(PERL) $(srcdir)/insns.pl -b $(srcdir)/insns.dat
-insnsa.c: $(INSDEP)
-	$(PERL) $(srcdir)/insns.pl -a $(srcdir)/insns.dat
-insnsd.c: $(INSDEP)
-	$(PERL) $(srcdir)/insns.pl -d $(srcdir)/insns.dat
-insnsi.h: $(INSDEP)
-	$(PERL) $(srcdir)/insns.pl -i $(srcdir)/insns.dat
-insnsn.c: $(INSDEP)
-	$(PERL) $(srcdir)/insns.pl -n $(srcdir)/insns.dat
+#-- Begin Generated File Rules --#
+# Edit in Makefile.in, not here!
+
+# These source files are automagically generated from data files using
+# Perl scripts. They're distributed, though, so it isn't necessary to
+# have Perl just to recompile NASM from the distribution.
+
+# 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
+
+INSDEP = x86/insns.dat x86/insns.pl x86/insns-iflags.ph
+
+x86/iflag.c: $(INSDEP)
+	$(RUNPERL) $(srcdir)/x86/insns.pl -fc \
+		$(srcdir)/x86/insns.dat x86/iflag.c
+x86/iflaggen.h: $(INSDEP)
+	$(RUNPERL) $(srcdir)/x86/insns.pl -fh \
+		$(srcdir)/x86/insns.dat x86/iflaggen.h
+x86/insnsb.c: $(INSDEP)
+	$(RUNPERL) $(srcdir)/x86/insns.pl -b \
+		$(srcdir)/x86/insns.dat x86/insnsb.c
+x86/insnsa.c: $(INSDEP)
+	$(RUNPERL) $(srcdir)/x86/insns.pl -a \
+		$(srcdir)/x86/insns.dat x86/insnsa.c
+x86/insnsd.c: $(INSDEP)
+	$(RUNPERL) $(srcdir)/x86/insns.pl -d \
+		$(srcdir)/x86/insns.dat x86/insnsd.c
+x86/insnsi.h: $(INSDEP)
+	$(RUNPERL) $(srcdir)/x86/insns.pl -i \
+		$(srcdir)/x86/insns.dat x86/insnsi.h
+x86/insnsn.c: $(INSDEP)
+	$(RUNPERL) $(srcdir)/x86/insns.pl -n \
+		$(srcdir)/x86/insns.dat x86/insnsn.c
 
 # These files contains all the standard macros that are derived from
 # the version number.
 version.h: version version.pl
-	$(PERL) $(srcdir)/version.pl h < $(srcdir)/version > version.h
-
+	$(RUNPERL) $(srcdir)/version.pl h < $(srcdir)/version > version.h
 version.mac: version version.pl
-	$(PERL) $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
+	$(RUNPERL) $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
+version.sed: version version.pl
+	$(RUNPERL) $(srcdir)/version.pl sed < $(srcdir)/version > version.sed
+version.mak: version version.pl
+	$(RUNPERL) $(srcdir)/version.pl make < $(srcdir)/version > version.mak
+nsis/version.nsh: version version.pl
+	$(RUNPERL) $(srcdir)/version.pl nsis < $(srcdir)/version > nsis/version.nsh
 
 # This source file is generated from the standard macros file
 # `standard.mac' by another Perl script. Again, it's part of the
 # standard distribution.
-
-macros.c: macros.pl pptok.ph standard.mac version.mac \
+macros/macros.c: macros/macros.pl asm/pptok.ph version.mac \
 	$(srcdir)/macros/*.mac $(srcdir)/output/*.mac
-	$(PERL) $(srcdir)/macros.pl $(srcdir)/standard.mac version.mac \
+	$(RUNPERL) $(srcdir)/macros/macros.pl version.mac \
 		$(srcdir)/macros/*.mac $(srcdir)/output/*.mac
 
 # These source files are generated from regs.dat by yet another
 # perl script.
-regs.c: regs.dat regs.pl
-	$(PERL) $(srcdir)/regs.pl c $(srcdir)/regs.dat > regs.c
-regflags.c: regs.dat regs.pl
-	$(PERL) $(srcdir)/regs.pl fc $(srcdir)/regs.dat > regflags.c
-regdis.c: regs.dat regs.pl
-	$(PERL) $(srcdir)/regs.pl dc $(srcdir)/regs.dat > regdis.c
-regdis.h: regs.dat regs.pl
-	$(PERL) $(srcdir)/regs.pl dh $(srcdir)/regs.dat > regdis.h
-regvals.c: regs.dat regs.pl
-	$(PERL) $(srcdir)/regs.pl vc $(srcdir)/regs.dat > regvals.c
-regs.h: regs.dat regs.pl
-	$(PERL) $(srcdir)/regs.pl h $(srcdir)/regs.dat > regs.h
+x86/regs.c: x86/regs.dat x86/regs.pl
+	$(RUNPERL) $(srcdir)/x86/regs.pl c \
+		$(srcdir)/x86/regs.dat > x86/regs.c
+x86/regflags.c: x86/regs.dat x86/regs.pl
+	$(RUNPERL) $(srcdir)/x86/regs.pl fc \
+		$(srcdir)/x86/regs.dat > x86/regflags.c
+x86/regdis.c: x86/regs.dat x86/regs.pl
+	$(RUNPERL) $(srcdir)/x86/regs.pl dc \
+		$(srcdir)/x86/regs.dat > x86/regdis.c
+x86/regdis.h: x86/regs.dat x86/regs.pl
+	$(RUNPERL) $(srcdir)/x86/regs.pl dh \
+		$(srcdir)/x86/regs.dat > x86/regdis.h
+x86/regvals.c: x86/regs.dat x86/regs.pl
+	$(RUNPERL) $(srcdir)/x86/regs.pl vc \
+		$(srcdir)/x86/regs.dat > x86/regvals.c
+x86/regs.h: x86/regs.dat x86/regs.pl
+	$(RUNPERL) $(srcdir)/x86/regs.pl h \
+		$(srcdir)/x86/regs.dat > x86/regs.h
 
 # Assembler token hash
-tokhash.c: insns.dat regs.dat tokens.dat tokhash.pl perllib/phash.ph
-	$(PERL) $(srcdir)/tokhash.pl c $(srcdir)/insns.dat $(srcdir)/regs.dat \
-		$(srcdir)/tokens.dat > tokhash.c
+asm/tokhash.c: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl \
+	perllib/phash.ph
+	$(RUNPERL) $(srcdir)/asm/tokhash.pl c \
+		$(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat \
+		$(srcdir)/asm/tokens.dat > asm/tokhash.c
 
 # Assembler token metadata
-tokens.h: insns.dat regs.dat tokens.dat tokhash.pl perllib/phash.ph
-	$(PERL) $(srcdir)/tokhash.pl h $(srcdir)/insns.dat $(srcdir)/regs.dat \
-		$(srcdir)/tokens.dat > tokens.h
+asm/tokens.h: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl \
+	perllib/phash.ph
+	$(RUNPERL) $(srcdir)/asm/tokhash.pl h \
+		$(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat \
+		$(srcdir)/asm/tokens.dat > asm/tokens.h
 
 # Preprocessor token hash
-pptok.h: pptok.dat pptok.pl perllib/phash.ph
-	$(PERL) $(srcdir)/pptok.pl h $(srcdir)/pptok.dat pptok.h
-pptok.c: pptok.dat pptok.pl perllib/phash.ph
-	$(PERL) $(srcdir)/pptok.pl c $(srcdir)/pptok.dat pptok.c
-pptok.ph: pptok.dat pptok.pl perllib/phash.ph
-	$(PERL) $(srcdir)/pptok.pl ph $(srcdir)/pptok.dat pptok.ph
+asm/pptok.h: asm/pptok.dat asm/pptok.pl perllib/phash.ph
+	$(RUNPERL) $(srcdir)/asm/pptok.pl h \
+		$(srcdir)/asm/pptok.dat asm/pptok.h
+asm/pptok.c: asm/pptok.dat asm/pptok.pl perllib/phash.ph
+	$(RUNPERL) $(srcdir)/asm/pptok.pl c \
+		$(srcdir)/asm/pptok.dat asm/pptok.c
+asm/pptok.ph: asm/pptok.dat asm/pptok.pl perllib/phash.ph
+	$(RUNPERL) $(srcdir)/asm/pptok.pl ph \
+		$(srcdir)/asm/pptok.dat asm/pptok.ph
 
 # Directives hash
-directiv.h: directiv.dat directiv.pl perllib/phash.ph
-	$(PERL) $(srcdir)/directiv.pl h $(srcdir)/directiv.dat directiv.h
-directbl.c: directiv.dat directiv.pl perllib/phash.ph
-	$(PERL) $(srcdir)/directiv.pl c $(srcdir)/directiv.dat directbl.c
-
-# This target generates all files that require perl.
-# This allows easier generation of distribution (see dist target).
-PERLREQ = macros.c insnsb.c insnsa.c insnsd.c insnsi.h insnsn.c \
-	  regs.c regs.h regflags.c regdis.c regvals.c tokhash.c tokens.h \
-	  version.h version.mac pptok.h pptok.c iflag.c iflaggen.h \
-	  directbl.c directiv.h pptok.ph regdis.h
+asm/directiv.h: asm/directiv.dat nasmlib/perfhash.pl perllib/phash.ph
+	$(RUNPERL) $(srcdir)/nasmlib/perfhash.pl h \
+		$(srcdir)/asm/directiv.dat asm/directiv.h
+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
+
 perlreq: $(PERLREQ)
 
+#-- End Generated File Rules --#
+
+#-- 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
+
+# Should only be done after "make everything".
+# The use of redirection here keeps makensis from moving the cwd to the
+# source directory.
+nsis: nsis/nasm.nsi nsis/arch.nsh nsis/version.nsh
+	$(MAKENSIS) -Dsrcdir="$(srcdir)" -Dobjdir="$(objdir)" - < nsis/nasm.nsi
+
+#-- End NSIS Rules --#
+
 clean:
 	-del /f *.$(O)
 	-del /f *.pdb
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 358da7f6..24aefd45 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -22,7 +22,8 @@ LD      = *wlink
 LDEBUG      =
 LDFLAGS     = op quiet $(%TARGET_LFLAGS) $(LDEBUG)
 LIBS        =
-PERL        = perl -I$(srcdir)/perllib -I$(srcdir)
+PERL        = perl
+RUNPERL     = $(PERL) -I$(srcdir)/perllib -I$(srcdir)
 
 STRIP       = wstrip
 
@@ -132,90 +133,140 @@ ndisasm$(X): $(NDISASM) $(LIBOBJ)
 nasm.lib: $(LIBOBJ)
     wlib -q -b -n $@ $(LIBOBJ)
 
-# These source files are automagically generated from a single
-# 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.
+#-- Begin Generated File Rules --#
+# Edit in Makefile.in, not here!
+
+# These source files are automagically generated from data files using
+# Perl scripts. They're distributed, though, so it isn't necessary to
+# have Perl just to recompile NASM from the distribution.
 
-insns.pl: insns-iflags.ph
+# 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
 
 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
+	$(RUNPERL) $(srcdir)/x86/insns.pl -fc &
+		$(srcdir)/x86/insns.dat x86/iflag.c
 x86/iflaggen.h: $(INSDEP)
-    $(PERL) $(srcdir)/x86/insns.pl -fh $(srcdir)/x86/insns.dat x86/iflaggen.h
+	$(RUNPERL) $(srcdir)/x86/insns.pl -fh &
+		$(srcdir)/x86/insns.dat x86/iflaggen.h
 x86/insnsb.c: $(INSDEP)
-    $(PERL) $(srcdir)/x86/insns.pl -b $(srcdir)/x86/insns.dat x86/insnsb.c
+	$(RUNPERL) $(srcdir)/x86/insns.pl -b &
+		$(srcdir)/x86/insns.dat x86/insnsb.c
 x86/insnsa.c: $(INSDEP)
-    $(PERL) $(srcdir)/x86/insns.pl -a $(srcdir)/x86/insns.dat x86/insnsa.c
+	$(RUNPERL) $(srcdir)/x86/insns.pl -a &
+		$(srcdir)/x86/insns.dat x86/insnsa.c
 x86/insnsd.c: $(INSDEP)
-    $(PERL) $(srcdir)/x86/insns.pl -d $(srcdir)/x86/insns.dat x86/insnsd.c
+	$(RUNPERL) $(srcdir)/x86/insns.pl -d &
+		$(srcdir)/x86/insns.dat x86/insnsd.c
 x86/insnsi.h: $(INSDEP)
-    $(PERL) $(srcdir)/x86/insns.pl -i $(srcdir)/x86/insns.dat x86/insnsi.h
+	$(RUNPERL) $(srcdir)/x86/insns.pl -i &
+		$(srcdir)/x86/insns.dat x86/insnsi.h
 x86/insnsn.c: $(INSDEP)
-    $(PERL) $(srcdir)/x86/insns.pl -n $(srcdir)/x86/insns.dat x86/insnsn.c
+	$(RUNPERL) $(srcdir)/x86/insns.pl -n &
+		$(srcdir)/x86/insns.dat x86/insnsn.c
 
 # These files contains all the standard macros that are derived from
 # the version number.
 version.h: version version.pl
-    $(PERL) $(srcdir)/version.pl h < $(srcdir)/version > version.h
-
+	$(RUNPERL) $(srcdir)/version.pl h < $(srcdir)/version > version.h
 version.mac: version version.pl
-    $(PERL) $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
+	$(RUNPERL) $(srcdir)/version.pl mac < $(srcdir)/version > version.mac
+version.sed: version version.pl
+	$(RUNPERL) $(srcdir)/version.pl sed < $(srcdir)/version > version.sed
+version.mak: version version.pl
+	$(RUNPERL) $(srcdir)/version.pl make < $(srcdir)/version > version.mak
+nsis/version.nsh: version version.pl
+	$(RUNPERL) $(srcdir)/version.pl nsis < $(srcdir)/version > nsis/version.nsh
 
 # This source file is generated from the standard macros file
 # `standard.mac' by another Perl script. Again, it's part of the
 # standard distribution.
-
-macros/macros.c: macros/macros.pl asm/pptok.ph version.mac $(srcdir)/macros/*.mac $(srcdir)/output/*.mac
-    $(PERL) $(srcdir)/macros/macros.pl version.mac $(srcdir)/macros/*.mac $(srcdir)/output/*.mac
+macros/macros.c: macros/macros.pl asm/pptok.ph version.mac &
+	$(srcdir)/macros/*.mac $(srcdir)/output/*.mac
+	$(RUNPERL) $(srcdir)/macros/macros.pl version.mac &
+		$(srcdir)/macros/*.mac $(srcdir)/output/*.mac
 
 # These source files are generated from regs.dat by yet another
 # perl script.
 x86/regs.c: x86/regs.dat x86/regs.pl
-    $(PERL) $(srcdir)/x86/regs.pl c $(srcdir)/x86/regs.dat > x86/regs.c
+	$(RUNPERL) $(srcdir)/x86/regs.pl c &
+		$(srcdir)/x86/regs.dat > x86/regs.c
 x86/regflags.c: x86/regs.dat x86/regs.pl
-    $(PERL) $(srcdir)/x86/regs.pl fc $(srcdir)/x86/regs.dat > x86/regflags.c
+	$(RUNPERL) $(srcdir)/x86/regs.pl fc &
+		$(srcdir)/x86/regs.dat > x86/regflags.c
 x86/regdis.c: x86/regs.dat x86/regs.pl
-    $(PERL) $(srcdir)/x86/regs.pl dc $(srcdir)/x86/regs.dat > x86/regdis.c
+	$(RUNPERL) $(srcdir)/x86/regs.pl dc &
+		$(srcdir)/x86/regs.dat > x86/regdis.c
 x86/regdis.h: x86/regs.dat x86/regs.pl
-    $(PERL) $(srcdir)/x86/regs.pl dh $(srcdir)/x86/regs.dat > x86/regdis.h
+	$(RUNPERL) $(srcdir)/x86/regs.pl dh &
+		$(srcdir)/x86/regs.dat > x86/regdis.h
 x86/regvals.c: x86/regs.dat x86/regs.pl
-    $(PERL) $(srcdir)/x86/regs.pl vc $(srcdir)/x86/regs.dat > x86/regvals.c
+	$(RUNPERL) $(srcdir)/x86/regs.pl vc &
+		$(srcdir)/x86/regs.dat > x86/regvals.c
 x86/regs.h: x86/regs.dat x86/regs.pl
-    $(PERL) $(srcdir)/x86/regs.pl h $(srcdir)/x86/regs.dat > x86/regs.h
+	$(RUNPERL) $(srcdir)/x86/regs.pl h &
+		$(srcdir)/x86/regs.dat > x86/regs.h
 
 # Assembler token hash
-asm/tokhash.c: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl perllib/phash.ph
-    $(PERL) $(srcdir)/asm/tokhash.pl c $(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat &
-        $(srcdir)/asm/tokens.dat > asm/tokhash.c
+asm/tokhash.c: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl &
+	perllib/phash.ph
+	$(RUNPERL) $(srcdir)/asm/tokhash.pl c &
+		$(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat &
+		$(srcdir)/asm/tokens.dat > asm/tokhash.c
 
 # Assembler token metadata
-asm/tokens.h: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl perllib/phash.ph
-    $(PERL) $(srcdir)/asm/tokhash.pl h $(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat &
-        $(srcdir)/asm/tokens.dat > asm/tokens.h
+asm/tokens.h: x86/insns.dat x86/regs.dat asm/tokens.dat asm/tokhash.pl &
+	perllib/phash.ph
+	$(RUNPERL) $(srcdir)/asm/tokhash.pl h &
+		$(srcdir)/x86/insns.dat $(srcdir)/x86/regs.dat &
+		$(srcdir)/asm/tokens.dat > asm/tokens.h
 
 # Preprocessor token hash
 asm/pptok.h: asm/pptok.dat asm/pptok.pl perllib/phash.ph
-    $(PERL) $(srcdir)/asm/pptok.pl h $(srcdir)/asm/pptok.dat asm/pptok.h
+	$(RUNPERL) $(srcdir)/asm/pptok.pl h &
+		$(srcdir)/asm/pptok.dat asm/pptok.h
 asm/pptok.c: asm/pptok.dat asm/pptok.pl perllib/phash.ph
-    $(PERL) $(srcdir)/asm/pptok.pl c $(srcdir)/asm/pptok.dat asm/pptok.c
+	$(RUNPERL) $(srcdir)/asm/pptok.pl c &
+		$(srcdir)/asm/pptok.dat asm/pptok.c
 asm/pptok.ph: asm/pptok.dat asm/pptok.pl perllib/phash.ph
-    $(PERL) $(srcdir)/asm/pptok.pl ph $(srcdir)/asm/pptok.dat asm/pptok.ph
+	$(RUNPERL) $(srcdir)/asm/pptok.pl ph &
+		$(srcdir)/asm/pptok.dat asm/pptok.ph
 
 # Directives hash
-asm/directiv.h: asm/directiv.dat asm/directiv.pl perllib/phash.ph
-    $(PERL) $(srcdir)/asm/directiv.pl h $(srcdir)/asm/directiv.dat asm/directiv.h
-asm/directbl.c: asm/directiv.dat asm/directiv.pl perllib/phash.ph
-    $(PERL) $(srcdir)/asm/directiv.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 = macros/macros.c 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/regvals.c asm/tokhash.c asm/tokens.h &
-	  version.h version.mac asm/pptok.h asm/pptok.c x86/iflag.c
-perlreq: $(PERLREQ) .SYMBOLIC
+asm/directiv.h: asm/directiv.dat nasmlib/perfhash.pl perllib/phash.ph
+	$(RUNPERL) $(srcdir)/nasmlib/perfhash.pl h &
+		$(srcdir)/asm/directiv.dat asm/directiv.h
+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
+
+perlreq: $(PERLREQ)
+
+#-- End Generated File Rules --#
+
+#-- 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
+
+# Should only be done after "make everything".
+# The use of redirection here keeps makensis from moving the cwd to the
+# source directory.
+nsis: nsis/nasm.nsi nsis/arch.nsh nsis/version.nsh
+	$(MAKENSIS) -Dsrcdir="$(srcdir)" -Dobjdir="$(objdir)" - < nsis/nasm.nsi
+
+#-- End NSIS Rules --#
 
 clean: .SYMBOLIC
     rm -f *.$(O) *.s *.i