[rtems commit] network: Move header files

Sebastian Huber sebh at rtems.org
Wed Jun 7 13:28:30 UTC 2017


Module:    rtems
Branch:    master
Commit:    3bc19384a7be162b5c925add66dd879041db67a0
Changeset: http://git.rtems.org/rtems/commit/?id=3bc19384a7be162b5c925add66dd879041db67a0

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jun  6 15:30:40 2017 +0200

network: Move header files

Prevent accidental use of legacy network header files.

Update #2833.

---

 cpukit/libnetworking/Makefile.am                   | 24 +++++++++++-----------
 cpukit/libnetworking/{ => include}/arpa/inet.h     |  0
 cpukit/libnetworking/{ => include}/net/if.h        |  0
 cpukit/libnetworking/{ => include}/netdb.h         |  0
 cpukit/libnetworking/{ => include}/netinet/in.h    |  0
 cpukit/libnetworking/{ => include}/netinet/tcp.h   |  0
 cpukit/libnetworking/{ => include}/netinet6/in6.h  |  0
 .../{ => include}/sys/_sockaddr_storage.h          |  0
 cpukit/libnetworking/{ => include}/sys/socket.h    |  0
 cpukit/libnetworking/{ => include}/sys/syslog.h    |  0
 .../libnetworking/{ => include}/sys/ttydefaults.h  |  0
 cpukit/libnetworking/{ => include}/sys/un.h        |  0
 cpukit/libnetworking/{ => include}/syslog.h        |  0
 cpukit/libnetworking/preinstall.am                 | 24 +++++++++++-----------
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 6f5c593..3719e61 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
similarity index 100%
rename from cpukit/libnetworking/arpa/inet.h
rename to cpukit/libnetworking/include/arpa/inet.h
diff --git a/cpukit/libnetworking/net/if.h b/cpukit/libnetworking/include/net/if.h
similarity index 100%
rename from cpukit/libnetworking/net/if.h
rename to cpukit/libnetworking/include/net/if.h
diff --git a/cpukit/libnetworking/netdb.h b/cpukit/libnetworking/include/netdb.h
similarity index 100%
rename from cpukit/libnetworking/netdb.h
rename to cpukit/libnetworking/include/netdb.h
diff --git a/cpukit/libnetworking/netinet/in.h b/cpukit/libnetworking/include/netinet/in.h
similarity index 100%
rename from cpukit/libnetworking/netinet/in.h
rename to cpukit/libnetworking/include/netinet/in.h
diff --git a/cpukit/libnetworking/netinet/tcp.h b/cpukit/libnetworking/include/netinet/tcp.h
similarity index 100%
rename from cpukit/libnetworking/netinet/tcp.h
rename to cpukit/libnetworking/include/netinet/tcp.h
diff --git a/cpukit/libnetworking/netinet6/in6.h b/cpukit/libnetworking/include/netinet6/in6.h
similarity index 100%
rename from cpukit/libnetworking/netinet6/in6.h
rename to cpukit/libnetworking/include/netinet6/in6.h
diff --git a/cpukit/libnetworking/sys/_sockaddr_storage.h b/cpukit/libnetworking/include/sys/_sockaddr_storage.h
similarity index 100%
rename from cpukit/libnetworking/sys/_sockaddr_storage.h
rename to cpukit/libnetworking/include/sys/_sockaddr_storage.h
diff --git a/cpukit/libnetworking/sys/socket.h b/cpukit/libnetworking/include/sys/socket.h
similarity index 100%
rename from cpukit/libnetworking/sys/socket.h
rename to cpukit/libnetworking/include/sys/socket.h
diff --git a/cpukit/libnetworking/sys/syslog.h b/cpukit/libnetworking/include/sys/syslog.h
similarity index 100%
rename from cpukit/libnetworking/sys/syslog.h
rename to cpukit/libnetworking/include/sys/syslog.h
diff --git a/cpukit/libnetworking/sys/ttydefaults.h b/cpukit/libnetworking/include/sys/ttydefaults.h
similarity index 100%
rename from cpukit/libnetworking/sys/ttydefaults.h
rename to cpukit/libnetworking/include/sys/ttydefaults.h
diff --git a/cpukit/libnetworking/sys/un.h b/cpukit/libnetworking/include/sys/un.h
similarity index 100%
rename from cpukit/libnetworking/sys/un.h
rename to cpukit/libnetworking/include/sys/un.h
diff --git a/cpukit/libnetworking/syslog.h b/cpukit/libnetworking/include/syslog.h
similarity index 100%
rename from cpukit/libnetworking/syslog.h
rename to cpukit/libnetworking/include/syslog.h
diff --git a/cpukit/libnetworking/preinstall.am b/cpukit/libnetworking/preinstall.am
index 2427f1e..a3aa406 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



More information about the vc mailing list