4 files changed, 15 insertions, 30 deletions
diff --git a/cpukit/librpc/src/Makefile.am b/cpukit/librpc/src/Makefile.am
index 0e10adbd33..980d0ea432 100644
--- a/cpukit/librpc/src/Makefile.am
+++ b/cpukit/librpc/src/Makefile.am
@@ -5,5 +5,5 @@
 
 SUBDIRS = xdr rpc
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+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
index a3c2157658..cd8d96cf80 100644
--- a/cpukit/librpc/src/rpc/Makefile.am
+++ b/cpukit/librpc/src/rpc/Makefile.am
@@ -2,6 +2,9 @@
 ## $Id$
 ##
 
+include $(top_srcdir)/../automake/multilib.am
+include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/lib.am
 
 SUBDIRS = PSD.doc
 
@@ -23,12 +26,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-
 #
 # Add local stuff here using +=
 #
@@ -38,20 +35,15 @@ AM_CPPFLAGS += '-D__P(x)=x' -D_RPC_read=read -D_RPC_write=write -D_RPC_close=clo
 $(LIB): $(OBJS)
 	$(make-library)
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
-	$(INSTALL_DATA) $< $@
-
 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
 
 if HAS_NETWORKING
 man_MANS = $(noinst_MANS)
-all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(LIB)
 endif
 
-.PRECIOUS: $(LIB)
-
 EXTRA_DIST = $(C_FILES) DISCLAIMER $(UNUSED_C_FILES) $(noinst_MANS)
 
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/subdirs.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/librpc/src/rpc/PSD.doc/Makefile.am b/cpukit/librpc/src/rpc/PSD.doc/Makefile.am
index 1cece8e061..24b4d3fc85 100644
--- a/cpukit/librpc/src/rpc/PSD.doc/Makefile.am
+++ b/cpukit/librpc/src/rpc/PSD.doc/Makefile.am
@@ -4,4 +4,4 @@
 EXTRA_DIST = nfs.rfc.ms rpc.prog.ms rpc.rfc.ms rpcgen.ms xdr.nts.ms \
     xdr.rfc.ms
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/librpc/src/xdr/Makefile.am b/cpukit/librpc/src/xdr/Makefile.am
index fe92e0a427..26ba69becc 100644
--- a/cpukit/librpc/src/xdr/Makefile.am
+++ b/cpukit/librpc/src/xdr/Makefile.am
@@ -6,20 +6,18 @@
 LIBNAME = libxdr
 LIB = $(ARCH)/$(LIBNAME).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)/%.o)
 
 OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
-
 noinst_MANS = xdr.3
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-
 #
 # Add local stuff here using +=
 #
@@ -29,16 +27,11 @@ AM_CPPFLAGS += '-D__P(x)=x'
 $(LIB): $(OBJS)
 	$(make-library)
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
-	$(INSTALL_DATA) $< $@
-
 if HAS_NETWORKING
 man_MANS = $(noinst_MANS)
-all-local: $(ARCH) $(OBJS) $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(LIB)
 endif
 
-.PRECIOUS: $(LIB)
-
 EXTRA_DIST = $(C_FILES) $(noinst_MANS)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../automake/local.am