Makefile: remove explicit mention of lib/strlcpy.c

Don't inclure lib/strlcpy.c unconditionally, that is what
LIBOBJS is for.

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

5 files changed, 6 insertions, 11 deletions

diff --git a/Makefile.in b/Makefile.in
index 10c666c1..b151f384 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,7 +94,6 @@ NASM =	nasm.$(O) nasmlib.$(O) ver.$(O) \
 	macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) \
 	strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) \
 	ilog2.$(O) \
-	lib/strlcpy.$(O) \
 	preproc-nop.$(O) \
 	disp8.$(O) \
 	iflag.$(O)
@@ -409,7 +408,7 @@ output/outlib.$(O): output/outlib.c compiler.h config.h directiv.h insnsi.h \
  tables.h
 output/outmacho.$(O): output/outmacho.c compiler.h config.h directiv.h \
  insnsi.h nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h \
- pptok.h preproc.h raa.h regs.h saa.h tables.h
+ pptok.h preproc.h raa.h rbtree.h regs.h saa.h tables.h
 output/outobj.$(O): output/outobj.c compiler.h config.h directiv.h eval.h \
  insnsi.h nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h \
  pptok.h preproc.h regs.h stdscan.h tables.h
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index a1bfd5eb..9524c7c9 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -61,7 +61,6 @@ NASM =	nasm.$(O) nasmlib.$(O) ver.$(O) \
 	macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) \
 	strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) \
 	ilog2.$(O) \
-	lib/strlcpy.$(O) \
 	preproc-nop.$(O) \
 	disp8.$(O) \
 	iflag.$(O)
@@ -321,7 +320,7 @@ output/outlib.$(O): output/outlib.c compiler.h directiv.h insnsi.h nasm.h \
  nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h tables.h
 output/outmacho.$(O): output/outmacho.c compiler.h directiv.h insnsi.h \
  nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h raa.h regs.h saa.h tables.h
+ preproc.h raa.h rbtree.h regs.h saa.h tables.h
 output/outobj.$(O): output/outobj.c compiler.h directiv.h eval.h insnsi.h \
  nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
  preproc.h regs.h stdscan.h tables.h
diff --git a/Mkfiles/netware.mak b/Mkfiles/netware.mak
index d897f440..c2797f8b 100644
--- a/Mkfiles/netware.mak
+++ b/Mkfiles/netware.mak
@@ -48,7 +48,6 @@ NASM =	nasm.o nasmlib.o ver.o \
 	macros.o listing.o eval.o exprlib.o stdscan.o \
 	strfunc.o tokhash.o regvals.o regflags.o \
 	ilog2.o \
-	strlcpy.o \
 	preproc-nop.o \
 	disp8.o \
 	iflag.o
@@ -224,8 +223,8 @@ outieee.o: outieee.c compiler.h config.h directiv.h insnsi.h nasm.h \
 outlib.o: outlib.c compiler.h config.h directiv.h insnsi.h nasm.h nasmlib.h \
  opflags.h outlib.h pptok.h preproc.h regs.h tables.h
 outmacho.o: outmacho.c compiler.h config.h directiv.h insnsi.h nasm.h \
- nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h raa.h regs.h saa.h \
- tables.h
+ nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h raa.h rbtree.h \
+ regs.h saa.h tables.h
 outobj.o: outobj.c compiler.h config.h directiv.h eval.h insnsi.h nasm.h \
  nasmlib.h opflags.h outform.h outlib.h pptok.h preproc.h regs.h stdscan.h \
  tables.h
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 351df72c..7da7fe20 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -64,7 +64,6 @@ NASM =	nasm.$(O) nasmlib.$(O) ver.$(O) &
 	macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) &
 	strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) &
 	ilog2.$(O) &
-	lib/strlcpy.$(O) &
 	preproc-nop.$(O) &
 	disp8.$(O) &
 	iflag.$(O)
@@ -372,7 +371,7 @@ output/outlib.$(O): output/outlib.c compiler.h config.h directiv.h insnsi.h &
  tables.h
 output/outmacho.$(O): output/outmacho.c compiler.h config.h directiv.h &
  insnsi.h nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h &
- pptok.h preproc.h raa.h regs.h saa.h tables.h
+ pptok.h preproc.h raa.h rbtree.h regs.h saa.h tables.h
 output/outobj.$(O): output/outobj.c compiler.h config.h directiv.h eval.h &
  insnsi.h nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h &
  pptok.h preproc.h regs.h stdscan.h tables.h
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index 256abba8..299e2ba8 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -75,7 +75,6 @@ NASM =	nasm.$(O) nasmlib.$(O) ver.$(O) \
 	macros.$(O) listing.$(O) eval.$(O) exprlib.$(O) stdscan.$(O) \
 	strfunc.$(O) tokhash.$(O) regvals.$(O) regflags.$(O) \
 	ilog2.$(O) \
-	lib/strlcpy.$(O) \
 	preproc-nop.$(O) \
 	disp8.$(O) \
 	iflag.$(O)
@@ -335,7 +334,7 @@ output/outlib.$(O): output/outlib.c compiler.h directiv.h insnsi.h nasm.h \
  nasmlib.h opflags.h output/outlib.h pptok.h preproc.h regs.h tables.h
 output/outmacho.$(O): output/outmacho.c compiler.h directiv.h insnsi.h \
  nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
- preproc.h raa.h regs.h saa.h tables.h
+ preproc.h raa.h rbtree.h regs.h saa.h tables.h
 output/outobj.$(O): output/outobj.c compiler.h directiv.h eval.h insnsi.h \
  nasm.h nasmlib.h opflags.h output/outform.h output/outlib.h pptok.h \
  preproc.h regs.h stdscan.h tables.h