netware.mak: correct dependencies

The Makefile uses VPATH and stripped directory names for files, so
generate the dependencies accordingly.

diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index ffbe43c..79c70e3 100644 (file)
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -114,7 +114,7 @@ $(OBJDIR)/version.inc: $(PROOT)/version $(PROOT)/version.pl $(OBJDIR)
 
 #-- Magic hints to mkdep.pl --#
 # @object-ending: ".o"
-# @path-separator: "/"
+# @path-separator: ""
 # @continuation: "\"
 #-- Everything below is generated by mkdep.pl - do not edit --#
 assemble.o: assemble.c assemble.h compiler.h config.h insns.h insnsi.h \
@@ -139,8 +139,8 @@ insnsd.o: insnsd.c compiler.h config.h insns.h insnsi.h nasm.h nasmlib.h \
 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
+snprintf.o: snprintf.c compiler.h config.h nasmlib.h
+vsnprintf.o: 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 insnsi.h tables.h
@@ -153,30 +153,30 @@ ndisasm.o: ndisasm.c compiler.h config.h disasm.h insns.h insnsi.h nasm.h \
  nasmlib.h regs.h sync.h tokens.h version.h
 outform.o: outform.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
  regs.h version.h
-output/outaout.o: output/outaout.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h stdscan.h version.h
-output/outas86.o: output/outas86.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h version.h
-output/outbin.o: output/outbin.c compiler.h config.h eval.h insnsi.h \
- labels.h nasm.h nasmlib.h outform.h regs.h stdscan.h version.h
-output/outcoff.o: output/outcoff.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h version.h
-output/outdbg.o: output/outdbg.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h version.h
-output/outelf32.o: output/outelf32.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h stdscan.h version.h wsaa.h
-output/outelf64.o: output/outelf64.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h stdscan.h version.h wsaa.h
-output/outieee.o: output/outieee.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h version.h
-output/outmacho.o: output/outmacho.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h version.h
-output/outobj.o: output/outobj.c compiler.h config.h insnsi.h nasm.h \
+outaout.o: outaout.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ regs.h stdscan.h version.h
+outas86.o: outas86.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ regs.h version.h
+outbin.o: outbin.c compiler.h config.h eval.h insnsi.h labels.h nasm.h \
  nasmlib.h outform.h regs.h stdscan.h version.h
-output/outrdf.o: output/outrdf.c compiler.h config.h insnsi.h nasm.h \
- nasmlib.h outform.h regs.h version.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
+outcoff.o: outcoff.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ regs.h version.h
+outdbg.o: outdbg.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ regs.h version.h
+outelf32.o: outelf32.c compiler.h config.h insnsi.h nasm.h nasmlib.h \
+ outform.h regs.h stdscan.h version.h wsaa.h
+outelf64.o: outelf64.c compiler.h config.h insnsi.h nasm.h nasmlib.h \
+ outform.h regs.h stdscan.h version.h wsaa.h
+outieee.o: outieee.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ regs.h version.h
+outmacho.o: outmacho.c compiler.h config.h insnsi.h nasm.h nasmlib.h \
+ outform.h regs.h version.h
+outobj.o: outobj.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ regs.h stdscan.h version.h
+outrdf.o: outrdf.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ regs.h version.h
+outrdf2.o: outrdf2.c compiler.h config.h insnsi.h nasm.h nasmlib.h outform.h \
+ 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 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