Avoid #including .c files; instead compile as separate units

Don't #include .c files, even if they are auto-generated; instead
compile them as separate compilation units and let the linker do its
job.

1 files changed, 22 insertions, 19 deletions

diff --git a/Makefile.in b/Makefile.in
index 914c874..9fe7695 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,11 +65,12 @@ NASM =	nasm.$(O) nasmlib.$(O) float.$(O) insnsa.$(O) insnsb.$(O) \
 	output/outelf32.$(O) output/outelf64.$(O) \
 	output/outobj.$(O) output/outas86.$(O) output/outrdf2.$(O) \
 	output/outdbg.$(O) output/outieee.$(O) output/outmacho.$(O) \
-	preproc.$(O) pptok.$(O) \
-	listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) tokhash.$(O)
+	preproc.$(O) pptok.$(O) macros.$(O) \
+	listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) tokhash.$(O) \
+	regvals.$(O) regflags.$(O)
 
 NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) \
-	insnsd.$(O) insnsb.$(O)
+	insnsd.$(O) insnsb.$(O) insnsn.$(O) regs.$(O) regdis.$(O)
 
 all: nasm$(X) ndisasm$(X) nasm.man ndisasm.man
 	cd rdoff && $(MAKE) all
@@ -122,6 +123,8 @@ 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
@@ -146,8 +149,9 @@ pptok.c: pptok.dat pptok.pl perllib/phash.ph
 # 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
+	  regs.c regs.h regflags.c regdis.c regdis.h regvals.c \
+	  tokhash.c tokens.h pptok.h pptok.c \
+	  version.h version.mac
 perlreq: $(PERLREQ)
 
 install: nasm$(X) ndisasm$(X)
@@ -228,11 +232,10 @@ alldeps: perlreq
 # @path-separator: "/"
 #-- Everything below is generated by mkdep.pl - do not edit --#
 assemble.$(O): assemble.c assemble.h compiler.h config.h insns.h insnsi.h \
- nasm.h nasmlib.h pptok.h preproc.h regflags.c regs.h regvals.c tokens.h \
- version.h
+ nasm.h nasmlib.h pptok.h preproc.h regs.h tables.h tokens.h version.h
 crc64.$(O): crc64.c compiler.h config.h
-disasm.$(O): disasm.c compiler.h config.h disasm.h insns.h insnsi.h insnsn.c \
- names.c nasm.h nasmlib.h regdis.c regs.c regs.h sync.h tokens.h version.h
+disasm.$(O): disasm.c compiler.h config.h disasm.h insns.h insnsi.h nasm.h \
+ nasmlib.h regdis.h regs.h sync.h tables.h tokens.h version.h
 eval.$(O): eval.c compiler.h config.h eval.h float.h insnsi.h labels.h \
  nasm.h nasmlib.h regs.h version.h
 exprlib.$(O): exprlib.c compiler.h config.h insnsi.h nasm.h nasmlib.h regs.h \
@@ -247,15 +250,14 @@ insnsb.$(O): insnsb.c compiler.h config.h insns.h insnsi.h nasm.h nasmlib.h \
  regs.h tokens.h version.h
 insnsd.$(O): insnsd.c compiler.h config.h insns.h insnsi.h nasm.h nasmlib.h \
  regs.h tokens.h version.h
-insnsn.$(O): insnsn.c
+insnsn.$(O): insnsn.c compiler.h config.h insnsi.h tables.h
 labels.$(O): labels.c compiler.h config.h hashtbl.h insnsi.h nasm.h \
  nasmlib.h regs.h version.h
 lib/snprintf.$(O): lib/snprintf.c compiler.h config.h nasmlib.h
 lib/vsnprintf.$(O): lib/vsnprintf.c compiler.h config.h nasmlib.h
 listing.$(O): listing.c compiler.h config.h insnsi.h listing.h nasm.h \
  nasmlib.h regs.h version.h
-macros.$(O): macros.c compiler.h config.h
-names.$(O): names.c compiler.h config.h insnsn.c regs.c
+macros.$(O): macros.c compiler.h config.h insnsi.h tables.h
 nasm.$(O): nasm.c assemble.h compiler.h config.h eval.h float.h insns.h \
  insnsi.h labels.h listing.h nasm.h nasmlib.h outform.h parser.h pptok.h \
  preproc.h regs.h stdscan.h tokens.h version.h
@@ -290,15 +292,16 @@ output/outrdf.$(O): output/outrdf.c compiler.h config.h insnsi.h nasm.h \
 output/outrdf2.$(O): output/outrdf2.c compiler.h config.h insnsi.h nasm.h \
  nasmlib.h outform.h rdoff/rdoff.h regs.h version.h
 parser.$(O): parser.c compiler.h config.h float.h insns.h insnsi.h nasm.h \
- nasmlib.h parser.h regflags.c regs.h stdscan.h tokens.h version.h
+ nasmlib.h parser.h regs.h stdscan.h tables.h tokens.h version.h
 pptok.$(O): pptok.c compiler.h config.h hashtbl.h nasmlib.h pptok.h \
  preproc.h
-preproc.$(O): preproc.c compiler.h config.h hashtbl.h insnsi.h macros.c \
- nasm.h nasmlib.h pptok.h preproc.h regs.h stdscan.h tokens.h version.h
-regdis.$(O): regdis.c
-regflags.$(O): regflags.c
-regs.$(O): regs.c compiler.h config.h
-regvals.$(O): regvals.c
+preproc.$(O): preproc.c compiler.h config.h hashtbl.h insnsi.h nasm.h \
+ nasmlib.h pptok.h preproc.h regs.h stdscan.h tables.h tokens.h version.h
+regdis.$(O): regdis.c regs.h
+regflags.$(O): regflags.c compiler.h config.h insnsi.h nasm.h nasmlib.h \
+ regs.h tables.h version.h
+regs.$(O): regs.c compiler.h config.h insnsi.h tables.h
+regvals.$(O): regvals.c compiler.h config.h insnsi.h tables.h
 stdscan.$(O): stdscan.c compiler.h config.h insns.h insnsi.h nasm.h \
  nasmlib.h regs.h stdscan.h tokens.h version.h
 sync.$(O): sync.c compiler.h config.h nasmlib.h sync.h