build: Merge librpc/Makefile.am

This commit is contained in:
Sebastian Huber
2018-09-14 15:56:26 +02:00
parent c38d5177a9
commit 5079524c6f
4 changed files with 51 additions and 54 deletions

View File

@@ -488,6 +488,56 @@ libcpukit_a_SOURCES += libgnat/adasupp.c
endif
if LIBNETWORKING
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
if LIBPCI
libcpukit_a_SOURCES += libpci/pci_access.c
@@ -556,7 +606,7 @@ all-local: generate-vc-key
# librtemscpu
_SUBDIRS = . score rtems posix
_SUBDIRS += libnetworking librpc
_SUBDIRS += libnetworking
_SUBDIRS += libmisc
_SUBDIRS += libstdthreads
_SUBDIRS += wrapup

View File

@@ -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

View File

@@ -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

View File

@@ -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)