remove libcompat_minix as library

	. get rid of includes in libcompat_minix:
	  . move configfile.h to minix/include/
	  . all others are unneeded as they point to other files
	. merge the .c files with libc

Change-Id: I5e840c66fb9bc484f377926aa9d66473bbd16259

diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm
index 695d6d46530b9f22c2654c730c582e9ba79129dc..b99548b03d94fd8e56b61c50ff4718a46ad40c82 100644 (file)
--- a/distrib/sets/lists/minix/md.evbarm
+++ b/distrib/sets/lists/minix/md.evbarm
@@ -40,7 +40,7 @@
 ./usr/include/arm/bswap.h              minix-sys
 ./usr/include/arm/byte_swap.h          minix-sys
 ./usr/include/arm/cdefs.h              minix-sys
-./usr/include/arm/compat_jmp_buf.h     minix-sys
+./usr/include/arm/compat_jmp_buf.h     minix-sys       obsolete
 ./usr/include/arm/cpuconf.h            minix-sys
 ./usr/include/arm/cpu.h                        minix-sys
 ./usr/include/arm/disklabel.h          minix-sys

diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386
index 8fefd25eabb43298c6ebe72c04f1dc95f66aa853..424a347fe6ddb1a6fd9b3fcb55c4cef4317cffda 100644 (file)
--- a/distrib/sets/lists/minix/md.i386
+++ b/distrib/sets/lists/minix/md.i386
@@ -69,7 +69,7 @@
 ./usr/include/i386/byte_swap.h         minix-sys
 ./usr/include/i386/cdefs.h             minix-sys
 ./usr/include/i386/cmos.h              minix-sys
-./usr/include/i386/compat_jmp_buf.h    minix-sys
+./usr/include/i386/compat_jmp_buf.h    minix-sys       obsolete
 ./usr/include/i386/cpu.h               minix-sys
 ./usr/include/i386/disklabel.h         minix-sys
 ./usr/include/i386/diskparm.h          minix-sys

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 979e984d4dde01bb6426add2b20c33b4741c97ba..7beb005b9eb40f9cb6132f0669296aaaf92690d1 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -1423,12 +1423,12 @@
 ./usr/include/net/gen/in.h             minix-sys
 ./usr/include/net/gen/ip_hdr.h         minix-sys
 ./usr/include/net/gen/ip_io.h          minix-sys
-./usr/include/net/gen/nameser.h                minix-sys
-./usr/include/net/gen/netdb.h          minix-sys
+./usr/include/net/gen/nameser.h                minix-sys       obsolete
+./usr/include/net/gen/netdb.h          minix-sys       obsolete
 ./usr/include/net/gen/oneCsum.h                minix-sys
 ./usr/include/net/gen/psip_hdr.h       minix-sys
 ./usr/include/net/gen/psip_io.h                minix-sys
-./usr/include/net/gen/resolv.h         minix-sys
+./usr/include/net/gen/resolv.h         minix-sys       obsolete
 ./usr/include/net/gen/rip.h            minix-sys
 ./usr/include/net/gen/route.h          minix-sys
 ./usr/include/net/gen/socket.h         minix-sys
@@ -1635,7 +1635,7 @@
 ./usr/include/sys/ioctl.h              minix-sys
 ./usr/include/sys/iostat.h             minix-sys
 ./usr/include/sys/ipc.h                        minix-sys
-./usr/include/sys/jmp_buf.h            minix-sys
+./usr/include/sys/jmp_buf.h            minix-sys       obsolete
 ./usr/include/sys/joystick.h           minix-sys
 ./usr/include/sys/kbdio.h              minix-sys
 ./usr/include/sys/kcore.h              minix-sys
@@ -1858,7 +1858,7 @@
 ./usr/lib/bc/libc.a                    minix-sys       bitcode
 ./usr/lib/bc/libc++.a                  minix-sys       bitcode
 ./usr/lib/bc/libchardriver.a           minix-sys       bitcode
-./usr/lib/bc/libcompat_minix.a         minix-sys       bitcode
+./usr/lib/bc/libcompat_minix.a         minix-sys       bitcode obsolete
 ./usr/lib/bc/libcrypt.a                        minix-sys       bitcode
 ./usr/lib/bc/libcurses.a               minix-sys       bitcode
 ./usr/lib/bc/libddekit.a               minix-sys       bitcode
@@ -1914,7 +1914,7 @@
 ./usr/lib/cawf/me.mac                  minix-sys
 ./usr/lib/cawf/mnx.mac                 minix-sys
 ./usr/lib/cawf/ms.mac                  minix-sys
-./usr/lib/compat_minix.pc              minix-sys
+./usr/lib/compat_minix.pc              minix-sys       obsolete
 ./usr/lib/crontab                      minix-sys
 ./usr/lib/crt0.o                       minix-sys
 ./usr/lib/crtbegin.o                   minix-sys
@@ -1991,11 +1991,11 @@
 ./usr/lib/libc++.a                     minix-sys       libcxx
 ./usr/lib/libchardriver.a              minix-sys
 ./usr/lib/libchardriver_pic.a          minix-sys
-./usr/lib/libcompat_minix.a            minix-sys
-./usr/lib/libcompat_minix_pic.a                minix-sys
-./usr/lib/libcompat_minix.so.0.0       minix-sys
-./usr/lib/libcompat_minix.so.0         minix-sys
-./usr/lib/libcompat_minix.so           minix-sys
+./usr/lib/libcompat_minix.a            minix-sys       obsolete
+./usr/lib/libcompat_minix_pic.a                minix-sys       obsolete
+./usr/lib/libcompat_minix.so.0.0       minix-sys       obsolete
+./usr/lib/libcompat_minix.so.0         minix-sys       obsolete
+./usr/lib/libcompat_minix.so           minix-sys       obsolete
 ./usr/lib/libc.pc                      minix-sys
 ./usr/lib/libc_pic.a                   minix-sys
 ./usr/lib/libc++_pic.a                 minix-sys       libcxx

diff --git a/lib/Makefile b/lib/Makefile
index a5ec01b86d184aa9a2e7e4bebf5eefa19aed5d32..be825604afed454f79aec0bd454ca53fe1a94044 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -39,7 +39,6 @@ SUBDIR+=      ../minix/lib/libasyn \
                ../minix/lib/libbdev \
                ../minix/lib/libblockdriver \
                ../minix/lib/libchardriver \
-               ../minix/lib/libcompat_minix \
                ../minix/lib/libddekit \
                ../minix/lib/libdevman \
                ../minix/lib/libexec \

diff --git a/lib/libc/pkgconfig/libc.pc b/lib/libc/pkgconfig/libc.pc
index e997aa887d3cdfd2e9110b9aeb2899ff463f3ee5..415f4d29f3e9e1acbe6fe4a95c89c12f79ea8c0f 100644 (file)
--- 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 -lcompat_minix
+Libs: -lc -lminlib 

diff --git a/minix/commands/Makefile.inc b/minix/commands/Makefile.inc
index dbfc3795088cbccdd8e3b58a86ea8d9133cfc4b7..70ce47200c8823b7bbe2b9a47d188e042c0b8674 100644 (file)
--- a/minix/commands/Makefile.inc
+++ b/minix/commands/Makefile.inc
@@ -1,7 +1,7 @@
 # Only include Minix-specific libraries when compiling
 # for non-Minix, i.e. not natively in a crossbuild.
 .if !defined(HOSTPROGNAME)
-LDADD+= -lminlib -lcompat_minix -lasyn -lterminfo
+LDADD+= -lminlib -lasyn -lterminfo
 .endif
 
 BINDIR?=/usr/bin

diff --git a/minix/commands/add_route/add_route.c b/minix/commands/add_route/add_route.c
index 4e9787b3bd9819456ce9e7fc7947a146b51ebf4f..34f5fdc3e10ff872e6afb25d70fc053e2c3b7b35 100644 (file)
--- a/minix/commands/add_route/add_route.c
+++ b/minix/commands/add_route/add_route.c
@@ -15,7 +15,7 @@ Created August 7, 1991 by Philip Homburg
 
 #include <net/hton.h>
 #include <net/netlib.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/route.h>

diff --git a/minix/commands/arp/arp.c b/minix/commands/arp/arp.c
index d394c526035a6a2cad7402a09d4caee68ebd85b1..a66d61a1abba4ad1d998ca0605fd9b159872e04d 100644 (file)
--- a/minix/commands/arp/arp.c
+++ b/minix/commands/arp/arp.c
@@ -25,7 +25,7 @@ Manipulate ARP table
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ip_io.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 
 #include <net/gen/arp_io.h>

diff --git a/minix/commands/dhcpd/dhcpd.c b/minix/commands/dhcpd/dhcpd.c
index 00f8e051c06c8f6909911bb6d6d03b76b4e563ec..d88cb231495dfb7b52e7b6b932983f56581d6b3d 100644 (file)
--- a/minix/commands/dhcpd/dhcpd.c
+++ b/minix/commands/dhcpd/dhcpd.c
@@ -18,7 +18,7 @@
 #include <sys/asynchio.h>
 #include <net/hton.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ether.h>

diff --git a/minix/commands/dhcpd/tags.c b/minix/commands/dhcpd/tags.c
index e16e2b29235833dd8fdd8335ae4d663e3f6849c8..c85b1a835f1560d057e1d8cf410ae418a7ebd138 100644 (file)
--- a/minix/commands/dhcpd/tags.c
+++ b/minix/commands/dhcpd/tags.c
@@ -18,7 +18,7 @@
 #include <sys/asynchio.h>
 #include <net/hton.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ether.h>

diff --git a/minix/commands/hostaddr/hostaddr.c b/minix/commands/hostaddr/hostaddr.c
index 18cc506bda093ebe75988e3bf67048e11f857a5d..362a2d51278e25a6a81b499ee6bab082d5bd7643 100644 (file)
--- a/minix/commands/hostaddr/hostaddr.c
+++ b/minix/commands/hostaddr/hostaddr.c
@@ -26,10 +26,11 @@ Created:    Jan 27, 1992 by Philip Homburg
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ip_io.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
-#include <net/gen/nameser.h>
-#include <net/gen/resolv.h>
+
+#include <arpa/nameser.h>
+#include <resolv.h>
 #include <net/gen/dhcp.h>
 
 #include <minix/paths.h>

diff --git a/minix/commands/irdpd/irdpd.c b/minix/commands/irdpd/irdpd.c
index edbbbaa20185e78b7b4a80e911c3515058f85f8b..4caf62b9aa81fd0ec2f428560182e4b29671770d 100644 (file)
--- a/minix/commands/irdpd/irdpd.c
+++ b/minix/commands/irdpd/irdpd.c
@@ -27,7 +27,7 @@
 #include <net/gen/icmp_hdr.h>
 #include <net/gen/ip_io.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/oneCsum.h>
 #include <net/gen/socket.h>
 #include <net/gen/udp.h>

diff --git a/minix/commands/nonamed/nonamed.c b/minix/commands/nonamed/nonamed.c
index 34362da616dff0c45684d410593da9237a07b915..aeeb5803e5ea24d8f5f993a7880cefc38dcaa9c1 100644 (file)
--- a/minix/commands/nonamed/nonamed.c
+++ b/minix/commands/nonamed/nonamed.c
@@ -32,9 +32,9 @@ static const char version[] = "2.7";
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/nameser.h>
-#include <net/gen/resolv.h>
-#include <net/gen/netdb.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>

diff --git a/minix/commands/pr_routes/pr_routes.c b/minix/commands/pr_routes/pr_routes.c
index 1e24e3fd7244519a67a3e2056f5cde10d48177a6..6826a53254583b36c5aa1baf1d675388a4fc1e73 100644 (file)
--- a/minix/commands/pr_routes/pr_routes.c
+++ b/minix/commands/pr_routes/pr_routes.c
@@ -19,7 +19,7 @@ vmd/cmd/simple/pr_routes.c
 #include <net/gen/in.h>
 #include <net/gen/ip_io.h>
 #include <net/gen/route.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/inet.h>
 
 #define N_IF   64      /* More than enough? */

diff --git a/minix/commands/rarpd/rarpd.c b/minix/commands/rarpd/rarpd.c
index cf4a6b41933c0f140b2d42f5b4bc2fdf3384858e..cf4962651b9897e1cfdcf21c5575148e4b8d6bec 100644 (file)
--- a/minix/commands/rarpd/rarpd.c
+++ b/minix/commands/rarpd/rarpd.c
@@ -28,14 +28,14 @@ Changed:    Dec 11, 2000 by Kees J. Bot
 #include <sys/asynchio.h>
 #include <net/hton.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 #include <net/gen/if_ether.h>
 #include <net/gen/ip_io.h>
-#include <net/gen/nameser.h>
+#include <arpa/nameser.h>
 
 #define MAX_RARP_RETRIES       5
 #define RARP_TIMEOUT           5

diff --git a/minix/commands/rcp/rcp.c b/minix/commands/rcp/rcp.c
index 2087a7befa7eb57aa4fad5d817bb7b5cb3c950af..3b0318e0ed00636717a76ebe57d7480dc814afb5 100644 (file)
--- a/minix/commands/rcp/rcp.c
+++ b/minix/commands/rcp/rcp.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rcp.c 1.1 87/12/21 SMI"; /* from UCB 5.3 6/8/85"*/
 #include <signal.h>
 #include <unistd.h>
 
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/netlib.h>
 
 #if __STDC__

diff --git a/minix/commands/rget/rget.c b/minix/commands/rget/rget.c
index 48777bc129904f4f21e53e3c9db4c651a08b43ac..0c35736b31edd27518a1f4ad2c8a5462b549f6dc 100644 (file)
--- a/minix/commands/rget/rget.c
+++ b/minix/commands/rget/rget.c
@@ -18,7 +18,7 @@
 #if __minix
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_hdr.h>

diff --git a/minix/commands/rlogin/rlogin.c b/minix/commands/rlogin/rlogin.c
index 116287db253a2693e9a3a402475073528ebf6a01..90839c49cdef10b327999f3e149a27b977190453 100644 (file)
--- a/minix/commands/rlogin/rlogin.c
+++ b/minix/commands/rlogin/rlogin.c
@@ -59,7 +59,7 @@ static char sccsid[] = "@(#)rlogin.c  5.33 (Berkeley) 3/1/91";
 #include <net/netlib.h>
 #include <net/hton.h>
 #include <net/gen/in.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 

diff --git a/minix/commands/rsh/rsh.c b/minix/commands/rsh/rsh.c
index 2c308f8c4581b9968380ba197ba5d81019140d1f..230068c2baf669713fe60cc47bdb3da109fa2a0d 100644 (file)
--- a/minix/commands/rsh/rsh.c
+++ b/minix/commands/rsh/rsh.c
@@ -60,7 +60,7 @@ static char sccsid[] = "@(#)rsh.c     5.24 (Berkeley) 7/1/91";
 #include <unistd.h>
 
 #include <net/netlib.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 int main( int argc, char *argv[] );
 void usage( void );
 char *copyargs( char **argv );

diff --git a/minix/commands/rshd/rshd.c b/minix/commands/rshd/rshd.c
index ec15f825a976f179213d74ceda1ad09401cb99c4..cc2bdde5459904f7c02d8b71f20f610ecb570a97 100644 (file)
--- a/minix/commands/rshd/rshd.c
+++ b/minix/commands/rshd/rshd.c
@@ -30,7 +30,7 @@ in.rshd.c
 #include <sys/ioctl.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>

diff --git a/minix/commands/swifi/socket.c b/minix/commands/swifi/socket.c
index 324b7f11633fd17f58b0c883072e42b1eed9d5a1..bebcc0e8262d63cc0a7a5ae8af943ecc8528b0a2 100644 (file)
--- a/minix/commands/swifi/socket.c
+++ b/minix/commands/swifi/socket.c
@@ -24,7 +24,7 @@ Open a TCP connection
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>

diff --git a/minix/commands/syslogd/syslogd.c b/minix/commands/syslogd/syslogd.c
index 636dcad1689382178aa5f900008118ba0cf6e994..e16ede9cf8a918b0a98be0b3bf355b89d0c5ba49 100644 (file)
--- a/minix/commands/syslogd/syslogd.c
+++ b/minix/commands/syslogd/syslogd.c
@@ -102,7 +102,7 @@
 #include <net/gen/in.h>
 #include <net/gen/udp.h>
 #include <net/gen/udp_io.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 
 #define SYSLOG_NAMES
 #include <syslog.h>

diff --git a/minix/commands/tcpd/tcpd.c b/minix/commands/tcpd/tcpd.c
index 419a77781108bbac41352db62592bcaeb99eba5d..0d7679cfd05e627714f88b2f16774c9c2b74ff6a 100644 (file)
--- a/minix/commands/tcpd/tcpd.c
+++ b/minix/commands/tcpd/tcpd.c
@@ -19,7 +19,7 @@ tcpd.c
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 

diff --git a/minix/commands/tcpdp/tcpd.c b/minix/commands/tcpdp/tcpd.c
index b7ed98276721a4c39d0a9bb8adb7591e06d08a3d..9d1d32d7fa1ade5aa1efce69663ce37634c425b8 100644 (file)
--- a/minix/commands/tcpdp/tcpd.c
+++ b/minix/commands/tcpdp/tcpd.c
@@ -19,7 +19,7 @@ tcpd.c
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 

diff --git a/minix/commands/tcpstat/tcpstat.c b/minix/commands/tcpstat/tcpstat.c
index 33c44d196b8b98f52793b93cf546491adfaf2dd0..f5200a4564eae51da3593d50fae7b6e6373a7b41 100644 (file)
--- a/minix/commands/tcpstat/tcpstat.c
+++ b/minix/commands/tcpstat/tcpstat.c
@@ -21,7 +21,7 @@ Created:      June 1995 by Philip Homburg <philip@f-mnx.phicoh.com>
 #endif
 #include <net/netlib.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <minix/queryparam.h>
 #include <minix/com.h>

diff --git a/minix/commands/telnet/ttn.c b/minix/commands/telnet/ttn.c
index ba4f0c716ed0f66566d4151bf2d05323ba1568a0..7ba56590c575f0251bfafc45fea2fa19262b610b 100644 (file)
--- a/minix/commands/telnet/ttn.c
+++ b/minix/commands/telnet/ttn.c
@@ -18,7 +18,7 @@ ttn.c
 #include <net/netlib.h>
 #include <net/gen/in.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 #include "ttn.h"

diff --git a/minix/commands/telnetd/main.c b/minix/commands/telnetd/main.c
index c2f1f623e6ab44e6723827ce5b3bf31a5f2d7329..a4ded56aa5967869efe9265c67620bd99f380bf9 100644 (file)
--- a/minix/commands/telnetd/main.c
+++ b/minix/commands/telnetd/main.c
@@ -33,7 +33,7 @@
 #include <net/gen/tcp.h>
 #include <net/gen/tcp_io.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/inet.h>
 #include "telnetd.h"
 

diff --git a/minix/commands/udpstat/udpstat.c b/minix/commands/udpstat/udpstat.c
index 972865b633e799632efa12d201371a5ea6f36c42..54c1c73d1046a64fd5d831e592f5466e561678c6 100644 (file)
--- a/minix/commands/udpstat/udpstat.c
+++ b/minix/commands/udpstat/udpstat.c
@@ -22,7 +22,7 @@ Created:      March 2001 by Philip Homburg <philip@f-mnx.phicoh.com>
 #endif
 #include <net/netlib.h>
 #include <net/gen/inet.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 #include <net/gen/socket.h>
 #include <minix/queryparam.h>
 

diff --git a/minix/drivers/Makefile.inc b/minix/drivers/Makefile.inc
index c90ad6ae7c4f2d32512494688b5fdef305fd7dce..f9a17bb736c3b903bd5b703f2fcfcb35a8808385 100644 (file)
--- a/minix/drivers/Makefile.inc
+++ b/minix/drivers/Makefile.inc
@@ -1,7 +1,7 @@
 BINDIR?= /service
 MAN?=
 
-LDADD+= -lminlib -lcompat_minix
-DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+LDADD+= -lminlib 
+DPADD+= ${LIBMINLIB} 
 
 .include "../Makefile.inc"

diff --git a/minix/drivers/storage/ramdisk/Makefile b/minix/drivers/storage/ramdisk/Makefile
index 89d3e855f9c302993b78e585639bad74d9bdebf5..1c843aa8599d97a3a4ec7e1c7d864322dfd6f4c0 100644 (file)
--- a/minix/drivers/storage/ramdisk/Makefile
+++ b/minix/drivers/storage/ramdisk/Makefile
@@ -99,7 +99,6 @@ RAMDISK_DYNAMIC=       1
 PROGRAMS+=             ld.elf_so
 PROG_LIBS+=            libc
 PROG_MINIXLIBS+=       libminlib
-PROG_MINIXLIBS+=       libcompat_minix
 PROG_MINIXLIBS+=       libterminfo
 .endif
 

diff --git a/minix/drivers/storage/ramdisk/proto.common.dynamic b/minix/drivers/storage/ramdisk/proto.common.dynamic
index 6f1fe737f849e141bfd2f69c82188e7adc8865bc..c411a0dafb5ac80df36ce16124cef8a83edd2210 100644 (file)
--- a/minix/drivers/storage/ramdisk/proto.common.dynamic
+++ b/minix/drivers/storage/ramdisk/proto.common.dynamic
@@ -5,7 +5,6 @@
                lib d--755 0 0
                        libc.so.0 ---755 0 0 libc.so.0
                        libminlib.so.0 ---755 0 0 libminlib.so.0
-                       libcompat_minix.so.0 ---755 0 0 libcompat_minix.so.0
                        libterminfo.so.0 ---755 0 0 libterminfo.so.0
                $
        $

diff --git a/minix/fs/Makefile.inc b/minix/fs/Makefile.inc
index c90ad6ae7c4f2d32512494688b5fdef305fd7dce..f9a17bb736c3b903bd5b703f2fcfcb35a8808385 100644 (file)
--- a/minix/fs/Makefile.inc
+++ b/minix/fs/Makefile.inc
@@ -1,7 +1,7 @@
 BINDIR?= /service
 MAN?=
 
-LDADD+= -lminlib -lcompat_minix
-DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+LDADD+= -lminlib 
+DPADD+= ${LIBMINLIB} 
 
 .include "../Makefile.inc"

diff --git a/minix/include/Makefile b/minix/include/Makefile
index c11cb78243192c49deae9807496ead174cedc59b..510fd53382bff394b57391cb48753b837283b4c0 100644 (file)
--- a/minix/include/Makefile
+++ b/minix/include/Makefile
@@ -2,7 +2,7 @@
 
 NOOBJ=         # defined
 
-INCS+= env.h fetch.h lib.h libutil.h varargs.h
+INCS+= env.h fetch.h lib.h libutil.h varargs.h configfile.h
 
 .include <bsd.own.mk>
 

diff --git a/minix/lib/libcompat_minix/include/configfile.h b/minix/include/configfile.h
similarity index 100%
rename from minix/lib/libcompat_minix/include/configfile.h
rename to minix/include/configfile.h

diff --git a/minix/lib/Makefile b/minix/lib/Makefile
index c245be803f76b73158569446312d9bdc1d2719a7..d0d2f3f0d325134ef6aa968150c914fa9b4cc88f 100644 (file)
--- a/minix/lib/Makefile
+++ b/minix/lib/Makefile
@@ -12,7 +12,6 @@ SUBDIR+=      libaudiodriver
 SUBDIR+=       libbdev
 SUBDIR+=       libblockdriver
 SUBDIR+=       libchardriver
-SUBDIR+=       libcompat_minix
 SUBDIR+=       libddekit
 SUBDIR+=       libdevman
 SUBDIR+=       libexec

diff --git a/minix/lib/libc/Makefile.inc b/minix/lib/libc/Makefile.inc
index a78d7ffc4949bf5cd0dde184b9a45e70662d1d68..54710cca84a625db0d9540d55906614810b4974f 100644 (file)
--- a/minix/lib/libc/Makefile.inc
+++ b/minix/lib/libc/Makefile.inc
@@ -3,4 +3,4 @@
 
 SRCS+= minix-malloc.c minix-calloc.c
 SRCS+= minix-malloc-debug.c
-
+SRCS+= configfile.c mtab.c stderr.c

diff --git a/minix/lib/libcompat_minix/configfile.c b/minix/lib/libc/gen/configfile.c
similarity index 100%
rename from minix/lib/libcompat_minix/configfile.c
rename to minix/lib/libc/gen/configfile.c

diff --git a/minix/lib/libcompat_minix/mtab.c b/minix/lib/libc/gen/mtab.c
similarity index 100%
rename from minix/lib/libcompat_minix/mtab.c
rename to minix/lib/libc/gen/mtab.c

diff --git a/minix/lib/libcompat_minix/stderr.c b/minix/lib/libc/gen/stderr.c
similarity index 100%
rename from minix/lib/libcompat_minix/stderr.c
rename to minix/lib/libc/gen/stderr.c

diff --git a/minix/lib/libcompat_minix/Makefile b/minix/lib/libcompat_minix/Makefile
deleted file mode 100644 (file)
index 391ee3f..0000000
--- a/minix/lib/libcompat_minix/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-NOGCCERROR=yes
-NOCLANGERROR=yes
-
-.include <bsd.own.mk>
-
-LIB=   compat_minix
-USE_SHLIBDIR= yes
-
-.PATH:         ${.CURDIR}
-
-# std_err()
-SRCS+= stderr.c
-
-# Configfile Library.
-SRCS+= configfile.c
-
-# Minix 'mtab' handling functions.
-#
-# These should be changed when we switch to
-# NetBSD's 'mtab' format.
-SRCS+= mtab.c
-
-SUBDIR+= pkgconfig include
-
-.include <bsd.lib.mk>
-.include <bsd.subdir.mk>

diff --git a/minix/lib/libcompat_minix/include/Makefile b/minix/lib/libcompat_minix/include/Makefile
deleted file mode 100644 (file)
index 37c0e95..0000000
--- a/minix/lib/libcompat_minix/include/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-
-INCSDIR= /usr/include
-
-INCS+= configfile.h
-
-NOOBJ=  # defined
-
-SUBDIR+= ${MACHINE_ARCH}
-SUBDIR+= net sys
-
-.include <bsd.prog.mk>
-.include <bsd.subdir.mk>

diff --git a/minix/lib/libcompat_minix/include/earm/Makefile b/minix/lib/libcompat_minix/include/earm/Makefile
deleted file mode 100644 (file)
index 8b52c8c..0000000
--- a/minix/lib/libcompat_minix/include/earm/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/arm
-
-INCS= compat_jmp_buf.h
-
-NOOBJ= # defined
-
-.include <bsd.prog.mk>

diff --git a/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h
deleted file mode 100644 (file)
index 841f75c..0000000
--- a/minix/lib/libcompat_minix/include/earm/compat_jmp_buf.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _COMPAT_MACHINE_JMP_BUF_H
-#define _COMPAT_MACHINE_JMP_BUF_H
-
-/* This file is strictly dependant on the libc's
- * setjmp/longjmp code! Keep it in sync! */
-
-/* This is used only by libddekit's src/thread.c. 
- * Being incredibly fragile (not to mention hardly
- * portable, it would be a good idea to replace 
- * that code. */
-
-#define JB_PC 148
-#define JB_SP 144
-#define JB_BP 136
-
-#endif /* _COMPAT_MACHINE_JMP_BUF_H */

diff --git a/minix/lib/libcompat_minix/include/i386/Makefile b/minix/lib/libcompat_minix/include/i386/Makefile
deleted file mode 100644 (file)
index fc43426..0000000
--- a/minix/lib/libcompat_minix/include/i386/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/${MACHINE_ARCH}
-
-INCS= compat_jmp_buf.h
-
-NOOBJ=  # defined
-
-.include <bsd.prog.mk>

diff --git a/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h b/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h
deleted file mode 100644 (file)
index bb5526c..0000000
--- a/minix/lib/libcompat_minix/include/i386/compat_jmp_buf.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _COMPAT_MACHINE_JMP_BUF_H
-#define _COMPAT_MACHINE_JMP_BUF_H
-
-/* This file is strictly dependant on the libc's
- * setjmp/longjmp code! Keep it in sync! */
-
-/* This is used only by libddekit's src/thread.c. 
- * Being incredibly fragile (not to mention hardly
- * portable, it would be a good idea to replace 
- * that code. */
-
-#define JB_PC 0
-#define JB_SP 8
-#define JB_BP 12
-
-#endif /* _COMPAT_MACHINE_JMP_BUF_H */

diff --git a/minix/lib/libcompat_minix/include/net/Makefile b/minix/lib/libcompat_minix/include/net/Makefile
deleted file mode 100644 (file)
index 22cfa78..0000000
--- a/minix/lib/libcompat_minix/include/net/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-SUBDIR+= gen
-
-.include <bsd.subdir.mk>

diff --git a/minix/lib/libcompat_minix/include/net/gen/Makefile b/minix/lib/libcompat_minix/include/net/gen/Makefile
deleted file mode 100644 (file)
index b7cb02e..0000000
--- a/minix/lib/libcompat_minix/include/net/gen/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/net/gen
-
-INCS= netdb.h resolv.h nameser.h
-
-NOOBJ=  # defined
-
-.include <bsd.prog.mk>

diff --git a/minix/lib/libcompat_minix/include/net/gen/nameser.h b/minix/lib/libcompat_minix/include/net/gen/nameser.h
deleted file mode 100644 (file)
index 5c23c9b..0000000
--- a/minix/lib/libcompat_minix/include/net/gen/nameser.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Minix compatibility.
- */
-#include <arpa/nameser.h>
-

diff --git a/minix/lib/libcompat_minix/include/net/gen/netdb.h b/minix/lib/libcompat_minix/include/net/gen/netdb.h
deleted file mode 100644 (file)
index 630e5d6..0000000
--- a/minix/lib/libcompat_minix/include/net/gen/netdb.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Minix compatibility.
- */
-#include <netdb.h>
-

diff --git a/minix/lib/libcompat_minix/include/net/gen/resolv.h b/minix/lib/libcompat_minix/include/net/gen/resolv.h
deleted file mode 100644 (file)
index 9e347aa..0000000
--- a/minix/lib/libcompat_minix/include/net/gen/resolv.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Minix compatibility.
- */
-#include <resolv.h>
-

diff --git a/minix/lib/libcompat_minix/include/sys/Makefile b/minix/lib/libcompat_minix/include/sys/Makefile
deleted file mode 100644 (file)
index 2f54b88..0000000
--- a/minix/lib/libcompat_minix/include/sys/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-
-INCSDIR= /usr/include/sys
-
-INCS= jmp_buf.h
-
-NOOBJ=  # defined
-
-.include <bsd.prog.mk>

diff --git a/minix/lib/libcompat_minix/include/sys/jmp_buf.h b/minix/lib/libcompat_minix/include/sys/jmp_buf.h
deleted file mode 100644 (file)
index 28f1374..0000000
--- a/minix/lib/libcompat_minix/include/sys/jmp_buf.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Stub for libddekit. Hopefully this will go away soon. */
-#include <machine/compat_jmp_buf.h>

diff --git a/minix/lib/libcompat_minix/pkgconfig/Makefile b/minix/lib/libcompat_minix/pkgconfig/Makefile
deleted file mode 100644 (file)
index 6fa213c..0000000
--- a/minix/lib/libcompat_minix/pkgconfig/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-NOOBJ=  # defined
-
-.include <bsd.own.mk>
-
-FILES=compat_minix.pc
-FILESDIR=/usr/lib
-FILESMODE=444
-
-.include <bsd.prog.mk>

diff --git a/minix/lib/libcompat_minix/pkgconfig/compat_minix.pc b/minix/lib/libcompat_minix/pkgconfig/compat_minix.pc
deleted file mode 100644 (file)
index 5e7eec3..0000000
--- a/minix/lib/libcompat_minix/pkgconfig/compat_minix.pc
+++ /dev/null
@@ -1,4 +0,0 @@
-Name: compat_minix
-Description: Minix Compatibility Library
-Version: 1.0
-Libs: -lcompat_minix

diff --git a/minix/lib/libcompat_minix/shlib_version b/minix/lib/libcompat_minix/shlib_version
deleted file mode 100644 (file)
index 97c9f92..0000000
--- a/minix/lib/libcompat_minix/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=0
-minor=0

diff --git a/minix/lib/libminlib/servxcheck.c b/minix/lib/libminlib/servxcheck.c
index 3010878edcb60399f52e3ed4fee0359db70627bd..47d2caca9606800a6143da2b2a62fd0c76bef6a6 100644 (file)
--- a/minix/lib/libminlib/servxcheck.c
+++ b/minix/lib/libminlib/servxcheck.c
@@ -23,7 +23,7 @@
 #include <net/gen/tcp_io.h>
 #include <net/gen/inet.h>
 #include <net/gen/socket.h>
-#include <net/gen/netdb.h>
+#include <netdb.h>
 
 /* Default service access file. */
 static const char *path_servacces = _PATH_SERVACCES;

diff --git a/minix/net/Makefile.inc b/minix/net/Makefile.inc
index c90ad6ae7c4f2d32512494688b5fdef305fd7dce..6e52d1428c8a6aa42a4037d426300175d515f870 100644 (file)
--- a/minix/net/Makefile.inc
+++ b/minix/net/Makefile.inc
@@ -1,7 +1,7 @@
 BINDIR?= /service
 MAN?=
 
-LDADD+= -lminlib -lcompat_minix
-DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+LDADD+= -lminlib 
+DPADD+= ${LIBMINLIB}
 
 .include "../Makefile.inc"

diff --git a/minix/servers/Makefile.inc b/minix/servers/Makefile.inc
index c90ad6ae7c4f2d32512494688b5fdef305fd7dce..f9a17bb736c3b903bd5b703f2fcfcb35a8808385 100644 (file)
--- a/minix/servers/Makefile.inc
+++ b/minix/servers/Makefile.inc
@@ -1,7 +1,7 @@
 BINDIR?= /service
 MAN?=
 
-LDADD+= -lminlib -lcompat_minix
-DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+LDADD+= -lminlib 
+DPADD+= ${LIBMINLIB} 
 
 .include "../Makefile.inc"

diff --git a/minix/tests/Makefile b/minix/tests/Makefile
index b436d28acd6176e8d0240c11c78da8af22f0b248..3cf2a91a50e71ce0fbbfed631ea4fd76b1a41aa4 100644 (file)
--- a/minix/tests/Makefile
+++ b/minix/tests/Makefile
@@ -15,7 +15,7 @@ BINOWN=               bin
 FILES=         test1.c
 
 CFLAGS+=       -fno-builtin
-LDADD+=                -lm -lcompat_minix
+LDADD+=                -lm 
 
 .include <bsd.own.mk>
 

diff --git a/minix/tests/blocktest/Makefile.inc b/minix/tests/blocktest/Makefile.inc
index 25168204d7f38816efb8c16a5366f3cfad0fb3b5..cbeb43b839e3425f4380b9e7184b18674eecb0f0 100644 (file)
--- a/minix/tests/blocktest/Makefile.inc
+++ b/minix/tests/blocktest/Makefile.inc
@@ -1,4 +1,4 @@
 # Copied from drivers/Makefile.inc, and slightly edited.
-LDADD+= -lminlib -lcompat_minix
-DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+LDADD+= -lminlib 
+DPADD+= ${LIBMINLIB} 
 BINDIR?=/usr/sbin

diff --git a/minix/tests/ds/Makefile.inc b/minix/tests/ds/Makefile.inc
index 42bdd2bec4323eae01149c60e35fa3686751b330..950d4e92a601629afd5bdb290475e3613b97d1e7 100644 (file)
--- a/minix/tests/ds/Makefile.inc
+++ b/minix/tests/ds/Makefile.inc
@@ -1,4 +1,4 @@
 # Copied from drivers/Makefile.inc
-LDADD+= -lminlib -lcompat_minix
-DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+LDADD+= -lminlib
+DPADD+= ${LIBMINLIB} 
 BINDIR?=/usr/sbin

diff --git a/minix/tests/kernel/sys_vumap/Makefile.inc b/minix/tests/kernel/sys_vumap/Makefile.inc
index 42bdd2bec4323eae01149c60e35fa3686751b330..83e42085b2be533c2b663fed71560b70d16d73e7 100644 (file)
--- a/minix/tests/kernel/sys_vumap/Makefile.inc
+++ b/minix/tests/kernel/sys_vumap/Makefile.inc
@@ -1,4 +1,4 @@
 # Copied from drivers/Makefile.inc
-LDADD+= -lminlib -lcompat_minix
-DPADD+= ${LIBMINLIB} ${LIBCOMPAT_MINIX}
+LDADD+= -lminlib 
+DPADD+= ${LIBMINLIB} 
 BINDIR?=/usr/sbin

diff --git a/minix/tests/safecopy/Makefile b/minix/tests/safecopy/Makefile
index 42fd715c6a787db591b6d6fce57053c4588ac3c4..3a6921cf1fdf4769a16bbaa674fe247e53760a3a 100644 (file)
--- a/minix/tests/safecopy/Makefile
+++ b/minix/tests/safecopy/Makefile
@@ -2,10 +2,10 @@ all: requestor grantor 1fifo 2fifo
        chmod +x down run
 
 requestor: requestor.c inc.h
-       cc -static -o $@ $< -lsys -lminlib -lcompat_minix
+       cc -static -o $@ $< -lsys -lminlib 
 
 grantor: grantor.c inc.h
-       cc -static -o $@ $< -lsys -lminlib -lcompat_minix
+       cc -static -o $@ $< -lsys -lminlib 
 
 1fifo 2fifo:
        mkfifo $@

diff --git a/minix/usr.sbin/mkfs.mfs/Makefile.mkfs b/minix/usr.sbin/mkfs.mfs/Makefile.mkfs
index dc131d8dc5860b043bb00696a16755d671e07443..3dbdba0d296d6866e44af041d89d1c214021af93 100644 (file)
--- a/minix/usr.sbin/mkfs.mfs/Makefile.mkfs
+++ b/minix/usr.sbin/mkfs.mfs/Makefile.mkfs
@@ -11,7 +11,7 @@ CPPFLAGS+=    -I${.CURDIR}
 
 .if ${HOST_OSTYPE:C/\-.*//:U} == "Minix" || !defined(HOSTPROGNAME)
 #LSC: FIXME This should not be required, more so only on Minix...
-LDADD+= -lminlib -lcompat_minix
+LDADD+= -lminlib 
 DPADD+= ${MINLIB} ${COMPAT_MINIX}
 .endif
 

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 3c50ff59822d919c3b56e5c12724554624b17cb7..fea244b018c75b4634841c143f5c3db8dbea4622 100644 (file)
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -216,7 +216,6 @@ LIB${_lib:tu}=      ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
        blockdriver \
        chardriver \
        clkconf \
-       compat_minix \
        ddekit \
        ddekit_usb_client \
        ddekit_usb_server \

diff --git a/tools/Makefile.host b/tools/Makefile.host
index 3088a91ba8ed96d9fc5e3e0e67a629aa08e115e5..219b5e5385ecc705b3d9d01fbf746b3ce95889eb 100644 (file)
--- a/tools/Makefile.host
+++ b/tools/Makefile.host
@@ -13,10 +13,6 @@ NOMAN=               # defined
 HOSTEXEEXT=.exe
 .endif
 
-.if ${HOST_OSTYPE:C/\-.*//} == "Minix"
-LDADD+= -lcompat_minix
-.endif # ${HOST_OSTYPE:C/\-.*//} == "Minix"
-
 # Resolve pathnames in variables.
 _RESOLVE_VARS= CFLAGS CPPFLAGS DPADD HOST_CPPFLAGS LDADD
 .for var in ${_RESOLVE_VARS}