summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2000-06-04 11:52:06 +0000
committeritojun <itojun@NetBSD.org>2000-06-04 11:52:06 +0000
commit93b2b4e693affbf2acd5193b32e4fbede26f270e (patch)
tree9b9ed8527855e48f786dcc89f7cd4828634c0f82
parentc8c1e5854f55eb92b0b7bfbc417efac33cf3517d (diff)
remove include files in nonstandard path
(has been #error for couple of months).
-rw-r--r--distrib/sets/lists/comp/mi5
-rw-r--r--sys/netinet6/Makefile6
-rw-r--r--sys/netinet6/icmp6.h3
-rw-r--r--sys/netinet6/ip6.h3
-rw-r--r--sys/netkey/Makefile4
-rw-r--r--sys/netkey/keyv2.h3
6 files changed, 6 insertions, 18 deletions
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index c19ec1de121..8f7c934e468 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.223 2000/06/04 08:53:58 itojun Exp $
+# $NetBSD: mi,v 1.224 2000/06/04 11:52:06 itojun Exp $
./sys comp-sysutil-root
./usr/bin/addr2line comp-miscutil-bin
./usr/bin/ar comp-util-bin
@@ -669,13 +669,11 @@
./usr/include/netinet6 comp-c-include
./usr/include/netinet6/ah.h comp-c-include
./usr/include/netinet6/esp.h comp-c-include
-./usr/include/netinet6/icmp6.h comp-c-include
./usr/include/netinet6/in6.h comp-c-include
./usr/include/netinet6/in6_gif.h comp-c-include
./usr/include/netinet6/in6_ifattach.h comp-c-include
./usr/include/netinet6/in6_pcb.h comp-c-include
./usr/include/netinet6/in6_var.h comp-c-include
-./usr/include/netinet6/ip6.h comp-c-include
./usr/include/netinet6/ip6_mroute.h comp-c-include
./usr/include/netinet6/ip6_var.h comp-c-include
./usr/include/netinet6/ip6protosw.h comp-c-include
@@ -722,7 +720,6 @@
./usr/include/netkey/key_var.h comp-c-include
./usr/include/netkey/keydb.h comp-c-include
./usr/include/netkey/keysock.h comp-c-include
-./usr/include/netkey/keyv2.h comp-c-include
./usr/include/netnatm/natm.h comp-c-include
./usr/include/netns/idp.h comp-c-include
./usr/include/netns/idp_var.h comp-c-include
diff --git a/sys/netinet6/Makefile b/sys/netinet6/Makefile
index 874d852d456..e909865c30f 100644
--- a/sys/netinet6/Makefile
+++ b/sys/netinet6/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 1999/07/30 10:35:35 itojun Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/04 11:52:10 itojun Exp $
KDIR= /sys/netinet6
INCSDIR= /usr/include/netinet6
-INCS= ah.h esp.h icmp6.h in6.h in6_gif.h in6_ifattach.h in6_pcb.h \
- in6_var.h ip6.h ip6_mroute.h ip6_var.h ip6protosw.h \
+INCS= ah.h esp.h in6.h in6_gif.h in6_ifattach.h in6_pcb.h \
+ in6_var.h ip6_mroute.h ip6_var.h ip6protosw.h \
ipcomp.h ipsec.h mld6_var.h nd6.h pim6.h pim6_var.h udp6.h udp6_var.h
.include <bsd.kinc.mk>
diff --git a/sys/netinet6/icmp6.h b/sys/netinet6/icmp6.h
deleted file mode 100644
index 2f20326268e..00000000000
--- a/sys/netinet6/icmp6.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: icmp6.h,v 1.13 2000/02/09 00:54:56 itojun Exp $ */
-
-#error "wrong include file - include netinet/icmp6.h instead"
diff --git a/sys/netinet6/ip6.h b/sys/netinet6/ip6.h
deleted file mode 100644
index 415027dd585..00000000000
--- a/sys/netinet6/ip6.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: ip6.h,v 1.9 2000/02/09 00:54:57 itojun Exp $ */
-
-#error "wrong include file - include netinet/ip6.h instead"
diff --git a/sys/netkey/Makefile b/sys/netkey/Makefile
index c525fc8c836..82bf519a7c7 100644
--- a/sys/netkey/Makefile
+++ b/sys/netkey/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1999/07/01 08:12:59 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/04 11:52:11 itojun Exp $
KDIR= /sys/netkey
INCSDIR= /usr/include/netkey
-INCS= key.h key_debug.h key_var.h keydb.h keysock.h keyv2.h
+INCS= key.h key_debug.h key_var.h keydb.h keysock.h
.include <bsd.kinc.mk>
diff --git a/sys/netkey/keyv2.h b/sys/netkey/keyv2.h
deleted file mode 100644
index a6d2868c854..00000000000
--- a/sys/netkey/keyv2.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $NetBSD: keyv2.h,v 1.7 2000/02/09 03:27:32 itojun Exp $ */
-
-#error "wrong include file path - include net/pfkeyv2.h instead"