--- cpukit/Makefile.am | 47 +++++++++++++++++++++++++++++++++++++++++++- cpukit/configure.ac | 1 - cpukit/librpc/Makefile.am | 50 ----------------------------------------------- cpukit/wrapup/Makefile.am | 2 -- 4 files changed, 46 insertions(+), 54 deletions(-) delete mode 100644 cpukit/librpc/Makefile.am
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 6f0cb1dcfa..3bfaa6b38b 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -496,6 +496,51 @@ libcpukit_a_SOURCES += libfs/src/nfsclient/src/nfs.c libcpukit_a_SOURCES += libfs/src/nfsclient/src/rpcio.c libcpukit_a_SOURCES += libfs/src/nfsclient/src/sock_mbuf.c libcpukit_a_SOURCES += libfs/src/nfsclient/src/xdr_mbuf.c +libcpukit_a_SOURCES += librpc/src/rpc/auth_none.c +libcpukit_a_SOURCES += librpc/src/rpc/auth_unix.c +libcpukit_a_SOURCES += librpc/src/rpc/authunix_prot.c +libcpukit_a_SOURCES += librpc/src/rpc/bindresvport.c +libcpukit_a_SOURCES += librpc/src/rpc/clnt_generic.c +libcpukit_a_SOURCES += librpc/src/rpc/clnt_perror.c +libcpukit_a_SOURCES += librpc/src/rpc/clnt_raw.c +libcpukit_a_SOURCES += librpc/src/rpc/clnt_simple.c +libcpukit_a_SOURCES += librpc/src/rpc/clnt_tcp.c +libcpukit_a_SOURCES += librpc/src/rpc/clnt_udp.c +libcpukit_a_SOURCES += librpc/src/rpc/get_myaddress.c +libcpukit_a_SOURCES += librpc/src/rpc/getrpcent.c +libcpukit_a_SOURCES += librpc/src/rpc/getrpcport.c +libcpukit_a_SOURCES += librpc/src/rpc/netname.c +libcpukit_a_SOURCES += librpc/src/rpc/netnamer.c +libcpukit_a_SOURCES += librpc/src/rpc/pmap_clnt.c +libcpukit_a_SOURCES += librpc/src/rpc/pmap_getmaps.c +libcpukit_a_SOURCES += librpc/src/rpc/pmap_getport.c +libcpukit_a_SOURCES += librpc/src/rpc/pmap_prot2.c +libcpukit_a_SOURCES += librpc/src/rpc/pmap_prot.c +libcpukit_a_SOURCES += librpc/src/rpc/pmap_rmt.c +libcpukit_a_SOURCES += librpc/src/rpc/rpc_callmsg.c +libcpukit_a_SOURCES += librpc/src/rpc/rpc_commondata.c +libcpukit_a_SOURCES += librpc/src/rpc/rpcdname.c +libcpukit_a_SOURCES += librpc/src/rpc/rpc_dtablesize.c +libcpukit_a_SOURCES += librpc/src/rpc/rpc_prot.c +libcpukit_a_SOURCES += librpc/src/rpc/rtems_portmapper.c +libcpukit_a_SOURCES += librpc/src/rpc/rtems_rpc.c +libcpukit_a_SOURCES += librpc/src/rpc/rtime.c +libcpukit_a_SOURCES += librpc/src/rpc/svc_auth.c +libcpukit_a_SOURCES += librpc/src/rpc/svc_auth_unix.c +libcpukit_a_SOURCES += librpc/src/rpc/svc.c +libcpukit_a_SOURCES += librpc/src/rpc/svc_raw.c +libcpukit_a_SOURCES += librpc/src/rpc/svc_run.c +libcpukit_a_SOURCES += librpc/src/rpc/svc_simple.c +libcpukit_a_SOURCES += librpc/src/rpc/svc_tcp.c +libcpukit_a_SOURCES += librpc/src/rpc/svc_udp.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr_array.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr_float.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr_mem.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr_rec.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr_reference.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr_sizeof.c +libcpukit_a_SOURCES += librpc/src/xdr/xdr_stdio.c endif @@ -567,7 +612,7 @@ all-local: generate-vc-key # librtemscpu _SUBDIRS = . score rtems posix -_SUBDIRS += libnetworking librpc +_SUBDIRS += libnetworking _SUBDIRS += libmisc _SUBDIRS += libstdthreads _SUBDIRS += wrapup diff --git a/cpukit/configure.ac b/cpukit/configure.ac index a1061f00b7..30b498ff3c 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -498,7 +498,6 @@ score/cpu/x86_64/Makefile score/cpu/no_cpu/Makefile posix/Makefile libnetworking/Makefile -librpc/Makefile libmisc/Makefile libstdthreads/Makefile zlib/Makefile diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am deleted file mode 100644 index 7cdcfd818b..0000000000 --- a/cpukit/librpc/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am - - -if LIBNETWORKING -man_MANS = - -noinst_LIBRARIES = libxdr.a - -libxdr_a_SOURCES = src/xdr/xdr.c src/xdr/xdr_array.c src/xdr/xdr_float.c \ - src/xdr/xdr_mem.c src/xdr/xdr_rec.c src/xdr/xdr_reference.c \ - src/xdr/xdr_sizeof.c src/xdr/xdr_stdio.c -endif - -libxdr_mans = src/xdr/xdr.3 - -if LIBNETWORKING -man_MANS += $(libxdr_mans) - -noinst_LIBRARIES += librpc.a - -librpc_a_SOURCES = src/rpc/auth_none.c src/rpc/auth_unix.c \ - src/rpc/authunix_prot.c src/rpc/bindresvport.c src/rpc/clnt_generic.c \ - src/rpc/clnt_perror.c src/rpc/clnt_raw.c src/rpc/clnt_simple.c \ - src/rpc/clnt_tcp.c src/rpc/clnt_udp.c src/rpc/get_myaddress.c \ - src/rpc/getrpcent.c src/rpc/getrpcport.c src/rpc/netname.c \ - src/rpc/netnamer.c src/rpc/pmap_clnt.c src/rpc/pmap_getmaps.c \ - src/rpc/pmap_getport.c src/rpc/pmap_prot.c src/rpc/pmap_prot2.c \ - src/rpc/pmap_rmt.c src/rpc/rpc_callmsg.c src/rpc/rpc_commondata.c \ - src/rpc/rpc_dtablesize.c src/rpc/rpc_prot.c src/rpc/rpcdname.c \ - src/rpc/rtime.c src/rpc/svc.c src/rpc/svc_auth.c src/rpc/svc_auth_unix.c \ - src/rpc/svc_raw.c src/rpc/svc_run.c src/rpc/svc_simple.c \ - src/rpc/svc_tcp.c src/rpc/svc_udp.c src/rpc/rtems_portmapper.c \ - src/rpc/rtems_rpc.c -endif - -librpc_mans = src/rpc/bindresvport.3 src/rpc/getrpcent.3 src/rpc/publickey.3 \ - src/rpc/rpc.3 src/rpc/rpc_secure.3 src/rpc/rstat_svc.8 \ - src/rpc/des_crypt.3 src/rpc/getrpcport.3 src/rpc/publickey.5 \ - src/rpc/rpc.5 src/rpc/rstat.1 src/rpc/rtime.3 - -if LIBNETWORKING -man_MANS += $(librpc_mans) -endif - - - -## FIXME: Unused - -include $(top_srcdir)/automake/local.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 1b301bc119..6002cae21e 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -58,8 +58,6 @@ TMP_LIBS += ../libmisc/libxz.a if LIBNETWORKING TMP_LIBS += ../libnetworking/libnetworking.a -TMP_LIBS += ../librpc/librpc.a -TMP_LIBS += ../librpc/libxdr.a endif librtemscpu.a: $(TMP_LIBS) -- 2.16.4 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
