network: Move header files

Prevent accidental use of legacy network header files.

Update #2833.

14 files changed, 24 insertions, 24 deletions

diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 6f5c5937ef..3719e615c7 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -201,18 +201,18 @@ include_dev_miidir = $(includedir)/dev/mii
 include_dev_mii_HEADERS = dev/mii/mii.h
 
 if !HAS_NEWLIB_20170522_HEADER
-include_arpa_HEADERS += arpa/inet.h
-include_HEADERS += netdb.h
-include_HEADERS += syslog.h
-include_net_HEADERS += net/if.h
-include_netinet6_HEADERS = netinet6/in6.h
-include_netinet_HEADERS += netinet/in.h
-include_netinet_HEADERS += netinet/tcp.h
-include_sys_HEADERS += sys/_sockaddr_storage.h
-include_sys_HEADERS += sys/socket.h
-include_sys_HEADERS += sys/syslog.h
-include_sys_HEADERS += sys/ttydefaults.h
-include_sys_HEADERS += sys/un.h
+include_arpa_HEADERS += include/arpa/inet.h
+include_HEADERS += include/netdb.h
+include_HEADERS += include/syslog.h
+include_net_HEADERS += include/net/if.h
+include_netinet6_HEADERS = include/netinet6/in6.h
+include_netinet_HEADERS += include/netinet/in.h
+include_netinet_HEADERS += include/netinet/tcp.h
+include_sys_HEADERS += include/sys/_sockaddr_storage.h
+include_sys_HEADERS += include/sys/socket.h
+include_sys_HEADERS += include/sys/syslog.h
+include_sys_HEADERS += include/sys/ttydefaults.h
+include_sys_HEADERS += include/sys/un.h
 endif
 
 ## libc
diff --git a/cpukit/libnetworking/arpa/inet.h b/cpukit/libnetworking/include/arpa/inet.h
index 91e3a828ab..91e3a828ab 100644
--- a/cpukit/libnetworking/arpa/inet.h
+++ b/cpukit/libnetworking/include/arpa/inet.h
diff --git a/cpukit/libnetworking/net/if.h b/cpukit/libnetworking/include/net/if.h
index 3bedab4f6f..3bedab4f6f 100644
--- a/cpukit/libnetworking/net/if.h
+++ b/cpukit/libnetworking/include/net/if.h
diff --git a/cpukit/libnetworking/netdb.h b/cpukit/libnetworking/include/netdb.h
index 948a3c8cb0..948a3c8cb0 100644
--- a/cpukit/libnetworking/netdb.h
+++ b/cpukit/libnetworking/include/netdb.h
diff --git a/cpukit/libnetworking/netinet/in.h b/cpukit/libnetworking/include/netinet/in.h
index 4361a44767..4361a44767 100644
--- a/cpukit/libnetworking/netinet/in.h
+++ b/cpukit/libnetworking/include/netinet/in.h
diff --git a/cpukit/libnetworking/netinet/tcp.h b/cpukit/libnetworking/include/netinet/tcp.h
index 2262803b5e..2262803b5e 100644
--- a/cpukit/libnetworking/netinet/tcp.h
+++ b/cpukit/libnetworking/include/netinet/tcp.h
diff --git a/cpukit/libnetworking/netinet6/in6.h b/cpukit/libnetworking/include/netinet6/in6.h
index c5297690b2..c5297690b2 100644
--- a/cpukit/libnetworking/netinet6/in6.h
+++ b/cpukit/libnetworking/include/netinet6/in6.h
diff --git a/cpukit/libnetworking/sys/_sockaddr_storage.h b/cpukit/libnetworking/include/sys/_sockaddr_storage.h
index b6c3616f63..b6c3616f63 100644
--- a/cpukit/libnetworking/sys/_sockaddr_storage.h
+++ b/cpukit/libnetworking/include/sys/_sockaddr_storage.h
diff --git a/cpukit/libnetworking/sys/socket.h b/cpukit/libnetworking/include/sys/socket.h
index 99bfa1c072..99bfa1c072 100644
--- a/cpukit/libnetworking/sys/socket.h
+++ b/cpukit/libnetworking/include/sys/socket.h
diff --git a/cpukit/libnetworking/sys/syslog.h b/cpukit/libnetworking/include/sys/syslog.h
index d6eadd4c7d..d6eadd4c7d 100644
--- a/cpukit/libnetworking/sys/syslog.h
+++ b/cpukit/libnetworking/include/sys/syslog.h
diff --git a/cpukit/libnetworking/sys/ttydefaults.h b/cpukit/libnetworking/include/sys/ttydefaults.h
index e81cf54f94..e81cf54f94 100644
--- a/cpukit/libnetworking/sys/ttydefaults.h
+++ b/cpukit/libnetworking/include/sys/ttydefaults.h
diff --git a/cpukit/libnetworking/sys/un.h b/cpukit/libnetworking/include/sys/un.h
index 2b8e3f5f40..2b8e3f5f40 100644
--- a/cpukit/libnetworking/sys/un.h
+++ b/cpukit/libnetworking/include/sys/un.h
diff --git a/cpukit/libnetworking/syslog.h b/cpukit/libnetworking/include/syslog.h
index 830b4928ad..830b4928ad 100644
--- a/cpukit/libnetworking/syslog.h
+++ b/cpukit/libnetworking/include/syslog.h
diff --git a/cpukit/libnetworking/preinstall.am b/cpukit/libnetworking/preinstall.am
index 2427f1e7b6..a3aa406408 100644
--- a/cpukit/libnetworking/preinstall.am
+++ b/cpukit/libnetworking/preinstall.am
@@ -419,51 +419,51 @@ $(PROJECT_INCLUDE)/dev/mii/mii.h: dev/mii/mii.h $(PROJECT_INCLUDE)/dev/mii/$(dir
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/dev/mii/mii.h
 
 if !HAS_NEWLIB_20170522_HEADER
-$(PROJECT_INCLUDE)/arpa/inet.h: arpa/inet.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
+$(PROJECT_INCLUDE)/arpa/inet.h: include/arpa/inet.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/inet.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/inet.h
 
-$(PROJECT_INCLUDE)/netdb.h: netdb.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/netdb.h: include/netdb.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netdb.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netdb.h
 
-$(PROJECT_INCLUDE)/syslog.h: syslog.h $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_INCLUDE)/syslog.h: include/syslog.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syslog.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/syslog.h
 
-$(PROJECT_INCLUDE)/net/if.h: net/if.h $(PROJECT_INCLUDE)/net/$(dirstamp)
+$(PROJECT_INCLUDE)/net/if.h: include/net/if.h $(PROJECT_INCLUDE)/net/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if.h
 
-$(PROJECT_INCLUDE)/netinet6/in6.h: netinet6/in6.h $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
+$(PROJECT_INCLUDE)/netinet6/in6.h: include/netinet6/in6.h $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet6/in6.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet6/in6.h
 
-$(PROJECT_INCLUDE)/netinet/in.h: netinet/in.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
+$(PROJECT_INCLUDE)/netinet/in.h: include/netinet/in.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in.h
 
-$(PROJECT_INCLUDE)/netinet/tcp.h: netinet/tcp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
+$(PROJECT_INCLUDE)/netinet/tcp.h: include/netinet/tcp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp.h
 
-$(PROJECT_INCLUDE)/sys/_sockaddr_storage.h: sys/_sockaddr_storage.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+$(PROJECT_INCLUDE)/sys/_sockaddr_storage.h: include/sys/_sockaddr_storage.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
 
-$(PROJECT_INCLUDE)/sys/socket.h: sys/socket.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+$(PROJECT_INCLUDE)/sys/socket.h: include/sys/socket.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/socket.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/socket.h
 
-$(PROJECT_INCLUDE)/sys/syslog.h: sys/syslog.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+$(PROJECT_INCLUDE)/sys/syslog.h: include/sys/syslog.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/syslog.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/syslog.h
 
-$(PROJECT_INCLUDE)/sys/ttydefaults.h: sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+$(PROJECT_INCLUDE)/sys/ttydefaults.h: include/sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttydefaults.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttydefaults.h
 
-$(PROJECT_INCLUDE)/sys/un.h: sys/un.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
+$(PROJECT_INCLUDE)/sys/un.h: include/sys/un.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/un.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/un.h
 endif