merge libminlib with libc

Change-Id: I79cc4ea90c378a1da3dac16487b53034953827a7
2014-08-28 17:35:17 +02:00
parent c2808d8b07
commit bad58c9c51
63 changed files with 75 additions and 135 deletions
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -21,9 +21,7 @@ SUBDIR+=	../external/gpl3/gcc/lib/libgcc .WAIT

 .if defined(__MINIX)
 #LSC MINIX libc depends on
-# - libminlib because of minix/lib/libc/malloc-debug.c
 # - libmthread because of sys/lib/libunwind
-SUBDIR+=	../minix/lib/libminlib
 SUBDIR+=	.WAIT

 SUBDIR+=	../minix/lib/libsys
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -4,6 +4,13 @@
 # gen sources
 .if defined(__MINIX)
 .PATH: ${NETBSDSRCDIR}/minix/lib/libc/gen
+
+CPPFLAGS.fslib.c+= -I${NETBSDSRCDIR}/minix/fs
+CPPFLAGS.fsversion.c+= -I${NETBSDSRCDIR}/minix/fs
+
+SRCS+= dhcp_gettag.c dhcp_settag.c fsversion.c gcov.c gcov_flush.c itoa.c \
+	oneC_sum.c paramvalue.c read_tsc_64.c servxcheck.c fslib.c
+
 .endif # defined(__MINIX)
 .PATH: ${ARCHDIR}/gen ${.CURDIR}/gen

--- a/lib/libc/pkgconfig/libc.pc
+++ b/lib/libc/pkgconfig/libc.pc
@@ -1,4 +1,4 @@
 Name: c
 Description: NetBSD C Library
 Version: 1.0
-Libs: -lc -lminlib 
+Libs: -lc