[rtems commit] network: Optionally install network headers

Sebastian Huber sebh at rtems.org
Fri Mar 9 07:44:21 UTC 2018 

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Mar  9 08:38:18 2018 +0100

network: Optionally install network headers

Install the network headers only if --enable-networking is specified.

Update #3254.

---

 cpukit/configure.ac                               |  1 -
 cpukit/headers.am                                 | 21 ---------------------
 cpukit/libnetworking/Makefile.am                  |  2 ++
 cpukit/libnetworking/headers.am                   | 21 +++++++++++++++++++++
 cpukit/{include => libnetworking}/librtemsNfs.h   |  0
 cpukit/{include => libnetworking}/rpc/auth.h      |  0
 cpukit/{include => libnetworking}/rpc/auth_unix.h |  0
 cpukit/{include => libnetworking}/rpc/clnt.h      |  0
 cpukit/{include => libnetworking}/rpc/clnt_soc.h  |  0
 cpukit/{include => libnetworking}/rpc/clnt_stat.h |  0
 cpukit/{include => libnetworking}/rpc/pmap_clnt.h |  0
 cpukit/{include => libnetworking}/rpc/pmap_prot.h |  0
 cpukit/{include => libnetworking}/rpc/pmap_rmt.h  |  0
 cpukit/{include => libnetworking}/rpc/rpc.h       |  0
 cpukit/{include => libnetworking}/rpc/rpc_com.h   |  0
 cpukit/{include => libnetworking}/rpc/rpc_msg.h   |  0
 cpukit/{include => libnetworking}/rpc/rpcent.h    |  0
 cpukit/{include => libnetworking}/rpc/svc.h       |  0
 cpukit/{include => libnetworking}/rpc/svc_auth.h  |  0
 cpukit/{include => libnetworking}/rpc/svc_soc.h   |  0
 cpukit/{include => libnetworking}/rpc/types.h     |  0
 cpukit/{include => libnetworking}/rpc/xdr.h       |  0
 cpukit/librpc/Makefile.am                         |  6 +++---
 cpukit/wrapup/Makefile.am                         |  3 ---
 24 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index 8435e13..2352416 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -343,7 +343,6 @@ AC_CHECK_DECLS([utimes],,,[#include <sys/time.h>])
 AC_CHECK_DECLS([_Timecounter_Time_second],[RTEMS_TOOL_CHAIN_ERROR],,[#include <sys/time.h>])
 
 # ... far too many conditionals ...
-AM_CONDITIONAL(LIBRPC,[test x"$rtems_cv_HAS_NETWORKING" = x"yes"])
 AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes")
 
 AM_CONDITIONAL(HAS_MP,test x"$enable_multiprocessing" = x"yes" )
diff --git a/cpukit/headers.am b/cpukit/headers.am
index 379f6af..4939c5b 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -8,7 +8,6 @@ include_HEADERS += include/endian.h
 include_HEADERS += include/fdt.h
 include_HEADERS += include/libfdt.h
 include_HEADERS += include/libfdt_env.h
-include_HEADERS += include/librtemsNfs.h
 include_HEADERS += include/link.h
 include_HEADERS += include/link_elf.h
 include_HEADERS += include/md4.h
@@ -85,26 +84,6 @@ include_pci_HEADERS += include/pci/ids_extra.h
 include_pci_HEADERS += include/pci/irq.h
 include_pci_HEADERS += include/pci/pcireg.h
 
-include_rpcdir = $(includedir)/rpc
-include_rpc_HEADERS =
-include_rpc_HEADERS += include/rpc/auth.h
-include_rpc_HEADERS += include/rpc/auth_unix.h
-include_rpc_HEADERS += include/rpc/clnt.h
-include_rpc_HEADERS += include/rpc/clnt_soc.h
-include_rpc_HEADERS += include/rpc/clnt_stat.h
-include_rpc_HEADERS += include/rpc/pmap_clnt.h
-include_rpc_HEADERS += include/rpc/pmap_prot.h
-include_rpc_HEADERS += include/rpc/pmap_rmt.h
-include_rpc_HEADERS += include/rpc/rpc.h
-include_rpc_HEADERS += include/rpc/rpc_com.h
-include_rpc_HEADERS += include/rpc/rpc_msg.h
-include_rpc_HEADERS += include/rpc/rpcent.h
-include_rpc_HEADERS += include/rpc/svc.h
-include_rpc_HEADERS += include/rpc/svc_auth.h
-include_rpc_HEADERS += include/rpc/svc_soc.h
-include_rpc_HEADERS += include/rpc/types.h
-include_rpc_HEADERS += include/rpc/xdr.h
-
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS =
 include_rtems_HEADERS += include/rtems/assoc.h
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 7ff7057..755e61a 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -138,4 +138,6 @@ endif
 EXTRA_DIST += $(UNUSED_FILES)
 
 include $(top_srcdir)/automake/local.am
+if LIBNETWORKING
 include $(srcdir)/headers.am
+endif
diff --git a/cpukit/libnetworking/headers.am b/cpukit/libnetworking/headers.am
index 62e9e27..b4532e4 100644
--- a/cpukit/libnetworking/headers.am
+++ b/cpukit/libnetworking/headers.am
@@ -3,6 +3,7 @@
 
 include_HEADERS =
 include_HEADERS += ifaddrs.h
+include_HEADERS += librtemsNfs.h
 include_HEADERS += loop.h
 include_HEADERS += poll.h
 include_HEADERS += resolv.h
@@ -81,6 +82,26 @@ include_nfsclient_HEADERS =
 include_nfsclient_HEADERS += nfsclient/nfsargs.h
 include_nfsclient_HEADERS += nfsclient/nfsdiskless.h
 
+include_rpcdir = $(includedir)/rpc
+include_rpc_HEADERS =
+include_rpc_HEADERS += rpc/auth.h
+include_rpc_HEADERS += rpc/auth_unix.h
+include_rpc_HEADERS += rpc/clnt.h
+include_rpc_HEADERS += rpc/clnt_soc.h
+include_rpc_HEADERS += rpc/clnt_stat.h
+include_rpc_HEADERS += rpc/pmap_clnt.h
+include_rpc_HEADERS += rpc/pmap_prot.h
+include_rpc_HEADERS += rpc/pmap_rmt.h
+include_rpc_HEADERS += rpc/rpc.h
+include_rpc_HEADERS += rpc/rpc_com.h
+include_rpc_HEADERS += rpc/rpc_msg.h
+include_rpc_HEADERS += rpc/rpcent.h
+include_rpc_HEADERS += rpc/svc.h
+include_rpc_HEADERS += rpc/svc_auth.h
+include_rpc_HEADERS += rpc/svc_soc.h
+include_rpc_HEADERS += rpc/types.h
+include_rpc_HEADERS += rpc/xdr.h
+
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS =
 include_rtems_HEADERS += rtems/bootp.h
diff --git a/cpukit/include/librtemsNfs.h b/cpukit/libnetworking/librtemsNfs.h
similarity index 100%
rename from cpukit/include/librtemsNfs.h
rename to cpukit/libnetworking/librtemsNfs.h
diff --git a/cpukit/include/rpc/auth.h b/cpukit/libnetworking/rpc/auth.h
similarity index 100%
rename from cpukit/include/rpc/auth.h
rename to cpukit/libnetworking/rpc/auth.h
diff --git a/cpukit/include/rpc/auth_unix.h b/cpukit/libnetworking/rpc/auth_unix.h
similarity index 100%
rename from cpukit/include/rpc/auth_unix.h
rename to cpukit/libnetworking/rpc/auth_unix.h
diff --git a/cpukit/include/rpc/clnt.h b/cpukit/libnetworking/rpc/clnt.h
similarity index 100%
rename from cpukit/include/rpc/clnt.h
rename to cpukit/libnetworking/rpc/clnt.h
diff --git a/cpukit/include/rpc/clnt_soc.h b/cpukit/libnetworking/rpc/clnt_soc.h
similarity index 100%
rename from cpukit/include/rpc/clnt_soc.h
rename to cpukit/libnetworking/rpc/clnt_soc.h
diff --git a/cpukit/include/rpc/clnt_stat.h b/cpukit/libnetworking/rpc/clnt_stat.h
similarity index 100%
rename from cpukit/include/rpc/clnt_stat.h
rename to cpukit/libnetworking/rpc/clnt_stat.h
diff --git a/cpukit/include/rpc/pmap_clnt.h b/cpukit/libnetworking/rpc/pmap_clnt.h
similarity index 100%
rename from cpukit/include/rpc/pmap_clnt.h
rename to cpukit/libnetworking/rpc/pmap_clnt.h
diff --git a/cpukit/include/rpc/pmap_prot.h b/cpukit/libnetworking/rpc/pmap_prot.h
similarity index 100%
rename from cpukit/include/rpc/pmap_prot.h
rename to cpukit/libnetworking/rpc/pmap_prot.h
diff --git a/cpukit/include/rpc/pmap_rmt.h b/cpukit/libnetworking/rpc/pmap_rmt.h
similarity index 100%
rename from cpukit/include/rpc/pmap_rmt.h
rename to cpukit/libnetworking/rpc/pmap_rmt.h
diff --git a/cpukit/include/rpc/rpc.h b/cpukit/libnetworking/rpc/rpc.h
similarity index 100%
rename from cpukit/include/rpc/rpc.h
rename to cpukit/libnetworking/rpc/rpc.h
diff --git a/cpukit/include/rpc/rpc_com.h b/cpukit/libnetworking/rpc/rpc_com.h
similarity index 100%
rename from cpukit/include/rpc/rpc_com.h
rename to cpukit/libnetworking/rpc/rpc_com.h
diff --git a/cpukit/include/rpc/rpc_msg.h b/cpukit/libnetworking/rpc/rpc_msg.h
similarity index 100%
rename from cpukit/include/rpc/rpc_msg.h
rename to cpukit/libnetworking/rpc/rpc_msg.h
diff --git a/cpukit/include/rpc/rpcent.h b/cpukit/libnetworking/rpc/rpcent.h
similarity index 100%
rename from cpukit/include/rpc/rpcent.h
rename to cpukit/libnetworking/rpc/rpcent.h
diff --git a/cpukit/include/rpc/svc.h b/cpukit/libnetworking/rpc/svc.h
similarity index 100%
rename from cpukit/include/rpc/svc.h
rename to cpukit/libnetworking/rpc/svc.h
diff --git a/cpukit/include/rpc/svc_auth.h b/cpukit/libnetworking/rpc/svc_auth.h
similarity index 100%
rename from cpukit/include/rpc/svc_auth.h
rename to cpukit/libnetworking/rpc/svc_auth.h
diff --git a/cpukit/include/rpc/svc_soc.h b/cpukit/libnetworking/rpc/svc_soc.h
similarity index 100%
rename from cpukit/include/rpc/svc_soc.h
rename to cpukit/libnetworking/rpc/svc_soc.h
diff --git a/cpukit/include/rpc/types.h b/cpukit/libnetworking/rpc/types.h
similarity index 100%
rename from cpukit/include/rpc/types.h
rename to cpukit/libnetworking/rpc/types.h
diff --git a/cpukit/include/rpc/xdr.h b/cpukit/libnetworking/rpc/xdr.h
similarity index 100%
rename from cpukit/include/rpc/xdr.h
rename to cpukit/libnetworking/rpc/xdr.h
diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am
index 92a76ba..46d6a8e 100644
--- a/cpukit/librpc/Makefile.am
+++ b/cpukit/librpc/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/automake/compile.am
 
 EXTRA_DIST =
 
-if LIBRPC
+if LIBNETWORKING
 man_MANS =
 
 noinst_LIBRARIES = libxdr.a
@@ -17,7 +17,7 @@ endif
 libxdr_mans = src/xdr/xdr.3
 EXTRA_DIST += $(libxdr_mans)
 
-if LIBRPC
+if LIBNETWORKING
 man_MANS += $(libxdr_mans)
 
 noinst_LIBRARIES += librpc.a
@@ -47,7 +47,7 @@ librpc_mans = src/rpc/bindresvport.3 src/rpc/getrpcent.3 src/rpc/publickey.3 \
     src/rpc/rpc.5 src/rpc/rstat.1 src/rpc/rtime.3
 EXTRA_DIST += $(librpc_mans)
 
-if LIBRPC
+if LIBNETWORKING
 man_MANS += $(librpc_mans)
 endif
 
diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am
index 2fdb754..3b08874 100644
--- a/cpukit/wrapup/Makefile.am
+++ b/cpukit/wrapup/Makefile.am
@@ -86,9 +86,6 @@ if LIBNETWORKING
 TMP_LIBS += ../libnetworking/libnetworking.a
 TMP_LIBS += ../libnetworking/libc.a
 TMP_LIBS += ../libnetworking/lib.a
-endif
-
-if LIBRPC
 TMP_LIBS += ../librpc/librpc.a
 TMP_LIBS += ../librpc/libxdr.a
 endif

More information about the vc mailing list