2003-11-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* src/rpc/Makefile.am, src/xdr/Makefile.am, src/Makefile.am:
	Removed.
	* Makefile.am: Merge-in src/rpc/Makefile.am, src/xdr/Makefile.am,
	src/Makefile.am.
	Various fixes. Reformat.

3 files changed, 0 insertions, 89 deletions

diff --git a/cpukit/librpc/src/Makefile.am b/cpukit/librpc/src/Makefile.am
deleted file mode 100644
index b561cda3c4..0000000000
--- a/cpukit/librpc/src/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-##
-## $Id$
-##
-
-SUBDIRS = xdr rpc
-
-include $(top_srcdir)/automake/subdirs.am
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/librpc/src/rpc/Makefile.am b/cpukit/librpc/src/rpc/Makefile.am
deleted file mode 100644
index 297cf8d016..0000000000
--- a/cpukit/librpc/src/rpc/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##
-## $Id$
-##
-
-include $(top_srcdir)/automake/multilib.am
-include $(top_srcdir)/automake/compile.am
-include $(top_srcdir)/automake/lib.am
-
-LIB = $(ARCH)/librpc.a
-
-C_FILES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c \
-    clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \
-    clnt_udp.c get_myaddress.c getrpcent.c getrpcport.c netname.c netnamer.c \
-    pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c pmap_prot2.c \
-    pmap_rmt.c rpc_callmsg.c rpc_commondata.c rpc_dtablesize.c rpc_prot.c \
-    rpcdname.c rtime.c svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_run.c \
-    svc_simple.c svc_tcp.c svc_udp.c rtems_portmapper.c rtems_rpc.c
-UNUSED_C_FILES = auth_des.c auth_time.c authdes_prot.c clnt_unix.c \
-    crypt_client.c des_crypt.c des_soft.c getpublickey.c key_call.c \
-    key_prot_xdr.c svc_auth_des.c svc_unix.c
-
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
-
-#
-# Add local stuff here using +=
-#
-
-AM_CPPFLAGS += -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close -D_RTEMS_RPC_INTERNAL_
-
-if LIBRPC
-$(LIB): $(OBJS)
-	$(make-library)
-
-noinst_MANS = bindresvport.3 getrpcent.3 publickey.3 rpc.3 rpc_secure.3 \
-    rstat_svc.8 des_crypt.3 getrpcport.3 publickey.5 rpc.5 rstat.1 rtime.3
-
-man_MANS = $(noinst_MANS)
-all-local: $(ARCH) $(LIB)
-endif
-
-EXTRA_DIST = $(C_FILES) DISCLAIMER $(UNUSED_C_FILES) $(noinst_MANS)
-
-EXTRA_DIST += PSD.doc/nfs.rfc.ms PSD.doc/rpc.prog.ms PSD.doc/rpc.rfc.ms \
-    PSD.doc/rpcgen.ms PSD.doc/xdr.nts.ms PSD.doc/xdr.rfc.ms
-
-include $(top_srcdir)/automake/local.am
diff --git a/cpukit/librpc/src/xdr/Makefile.am b/cpukit/librpc/src/xdr/Makefile.am
deleted file mode 100644
index 3e7d848e3e..0000000000
--- a/cpukit/librpc/src/xdr/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-##
-## $Id$
-##
-
-LIB = $(ARCH)/libxdr.a
-
-include $(top_srcdir)/automake/multilib.am
-include $(top_srcdir)/automake/compile.am
-include $(top_srcdir)/automake/lib.am
-
-C_FILES = xdr.c xdr_array.c xdr_float.c xdr_mem.c xdr_rec.c xdr_reference.c \
-    xdr_sizeof.c xdr_stdio.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
-OBJS = $(C_O_FILES)
-
-noinst_MANS = xdr.3
-
-#
-# Add local stuff here using +=
-#
-
-if LIBRPC
-$(LIB): $(OBJS)
-	$(make-library)
-
-man_MANS = $(noinst_MANS)
-all-local: $(ARCH) $(LIB)
-endif
-
-EXTRA_DIST = $(C_FILES) $(noinst_MANS)
-
-include $(top_srcdir)/automake/local.am