3 files changed, 23 insertions, 41 deletions
diff --git a/cpukit/librpc/include/Makefile.am b/cpukit/librpc/include/Makefile.am
index 5caf4c1c31..ec8e0b4a23 100644
--- a/cpukit/librpc/include/Makefile.am
+++ b/cpukit/librpc/include/Makefile.am
@@ -2,8 +2,29 @@
 ## $Id$
 ##
 
+include_rpcdir = $(includedir)/rpc
 
-SUBDIRS = rpc rpcsvc
+if HAS_NETWORKING
+include_rpc_HEADERS = \
+    rpc/auth.h rpc/auth_des.h rpc/auth_unix.h rpc/clnt.h rpc/des.h rpc/des_crypt.h rpc/pmap_clnt.h \
+    rpc/pmap_prot.h rpc/pmap_rmt.h rpc/rpc.h rpc/rpc_com.h rpc/rpc_msg.h rpc/svc.h rpc/svc_auth.h \
+    rpc/types.h rpc/xdr.h
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rpc \
+    $(include_rpc_HEADERS:rpc/%=$(PROJECT_INCLUDE)/rpc/%)
+
+$(PROJECT_INCLUDE)/rpc:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+endif
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = rpcsvc/bootparam_prot.x rpcsvc/crypt.x rpcsvc/key_prot.x rpcsvc/klm_prot.x rpcsvc/mount.x \
+    rpcsvc/nfs_prot.x rpcsvc/nis.x rpcsvc/nis_cache.x rpcsvc/nis_callback.x rpcsvc/nis_db.h rpcsvc/nis_object.x \
+    rpcsvc/nis_tags.h rpcsvc/nislib.h rpcsvc/nlm_prot.x rpcsvc/pmap_prot.x rpcsvc/rex.x rpcsvc/rnusers.x rpcsvc/rquota.x \
+    rpcsvc/rstat.x rpcsvc/rwall.x rpcsvc/sm_inter.x rpcsvc/spray.x rpcsvc/yp.x rpcsvc/yp_prot.h rpcsvc/ypclnt.h rpcsvc/yppasswd.x \
+    rpcsvc/ypupdate_prot.x rpcsvc/ypxfrd.x
 
-include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/librpc/include/rpc/Makefile.am b/cpukit/librpc/include/rpc/Makefile.am
deleted file mode 100644
index e92b895980..0000000000
--- a/cpukit/librpc/include/rpc/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##
-## $Id$
-##
-
-
-include_rpcdir = $(includedir)/rpc
-
-H_FILES = auth.h auth_des.h auth_unix.h clnt.h des.h des_crypt.h pmap_clnt.h \
-    pmap_prot.h pmap_rmt.h rpc.h rpc_com.h rpc_msg.h svc.h svc_auth.h \
-    types.h xdr.h
-
-if HAS_NETWORKING
-include_rpc_HEADERS = $(H_FILES)
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rpc \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/rpc/%)
-
-$(PROJECT_INCLUDE)/rpc:
-	@$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rpc/%.h: %.h
-	$(INSTALL_DATA) $< $@
-endif
-
-all-local: $(PREINSTALL_FILES)
-
-EXTRA_DIST = $(H_FILES)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/cpukit/librpc/include/rpcsvc/Makefile.am b/cpukit/librpc/include/rpcsvc/Makefile.am
deleted file mode 100644
index e6153355cf..0000000000
--- a/cpukit/librpc/include/rpcsvc/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## $Id$
-
-
-## Currently unused
-
-EXTRA_DIST = bootparam_prot.x crypt.x key_prot.x klm_prot.x mount.x \
-    nfs_prot.x nis.x nis_cache.x nis_callback.x nis_db.h nis_object.x \
-    nis_tags.h nislib.h nlm_prot.x pmap_prot.x rex.x rnusers.x rquota.x \
-    rstat.x rwall.x sm_inter.x spray.x yp.x yp_prot.h ypclnt.h yppasswd.x \
-    ypupdate_prot.x ypxfrd.x
-
-include $(top_srcdir)/../automake/local.am