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, 17 insertions, 16 deletions

diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index e4b4db2..2824cc6 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -39,11 +39,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)
 	rem cd rdoff && $(MAKE) all
@@ -177,10 +178,10 @@ everything: all doc rdf
 # @exclude: "config.h"
 #-- Everything below is generated by mkdep.pl - do not edit --#
 assemble.$(O): assemble.c assemble.h compiler.h insns.h insnsi.h nasm.h \
- nasmlib.h pptok.h preproc.h regflags.c regs.h regvals.c tokens.h version.h
+ nasmlib.h pptok.h preproc.h regs.h tables.h tokens.h version.h
 crc64.$(O): crc64.c compiler.h
-disasm.$(O): disasm.c compiler.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 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 eval.h float.h insnsi.h labels.h nasm.h \
  nasmlib.h regs.h version.h
 exprlib.$(O): exprlib.c compiler.h insnsi.h nasm.h nasmlib.h regs.h \
@@ -195,15 +196,14 @@ insnsb.$(O): insnsb.c compiler.h insns.h insnsi.h nasm.h nasmlib.h regs.h \
  tokens.h version.h
 insnsd.$(O): insnsd.c compiler.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 insnsi.h tables.h
 labels.$(O): labels.c compiler.h hashtbl.h insnsi.h nasm.h nasmlib.h regs.h \
  version.h
 lib/snprintf.$(O): lib/snprintf.c compiler.h nasmlib.h
 lib/vsnprintf.$(O): lib/vsnprintf.c compiler.h nasmlib.h
 listing.$(O): listing.c compiler.h insnsi.h listing.h nasm.h nasmlib.h \
  regs.h version.h
-macros.$(O): macros.c compiler.h
-names.$(O): names.c compiler.h insnsn.c regs.c
+macros.$(O): macros.c compiler.h insnsi.h tables.h
 nasm.$(O): nasm.c assemble.h compiler.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
@@ -238,14 +238,15 @@ output/outrdf.$(O): output/outrdf.c compiler.h insnsi.h nasm.h nasmlib.h \
 output/outrdf2.$(O): output/outrdf2.c compiler.h insnsi.h nasm.h nasmlib.h \
  outform.h rdoff/rdoff.h regs.h version.h
 parser.$(O): parser.c compiler.h float.h insns.h insnsi.h nasm.h nasmlib.h \
- parser.h regflags.c regs.h stdscan.h tokens.h version.h
+ parser.h regs.h stdscan.h tables.h tokens.h version.h
 pptok.$(O): pptok.c compiler.h hashtbl.h nasmlib.h pptok.h preproc.h
-preproc.$(O): preproc.c compiler.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
-regvals.$(O): regvals.c
+preproc.$(O): preproc.c compiler.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 insnsi.h nasm.h nasmlib.h regs.h \
+ tables.h version.h
+regs.$(O): regs.c compiler.h insnsi.h tables.h
+regvals.$(O): regvals.c compiler.h insnsi.h tables.h
 stdscan.$(O): stdscan.c compiler.h insns.h insnsi.h nasm.h nasmlib.h regs.h \
  stdscan.h tokens.h version.h
 sync.$(O): sync.c compiler.h nasmlib.h sync.h