3 files changed, 41 insertions, 32 deletions
diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog
index c8a28becce..24d32ae1c1 100644
--- a/cpukit/librpc/ChangeLog
+++ b/cpukit/librpc/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-24	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Merge-in include/Makefile.am.
+	* include/Makefile.am: Remove.
+
 2003-07-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove (Merged-in into ../configure.ac)
diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am
index e2594d7b97..966d4b9e44 100644
--- a/cpukit/librpc/Makefile.am
+++ b/cpukit/librpc/Makefile.am
@@ -2,9 +2,43 @@
 ## $Id$
 ##
 
-SUBDIRS = include src
+SUBDIRS = . src
 
-EXTRA_DIST = README_RTEMS
+if HAS_NETWORKING
+include_rpcdir = $(includedir)/rpc
+include_rpc_HEADERS = \
+    include/rpc/auth.h include/rpc/auth_des.h include/rpc/auth_unix.h \
+    include/rpc/clnt.h include/rpc/des.h include/rpc/des_crypt.h \
+    include/rpc/pmap_clnt.h include/rpc/pmap_prot.h include/rpc/pmap_rmt.h \
+    include/rpc/rpc.h include/rpc/rpc_com.h include/rpc/rpc_msg.h \
+    include/rpc/svc.h include/rpc/svc_auth.h \
+    include/rpc/types.h include/rpc/xdr.h
+
+PREINSTALL_FILES = $(PROJECT_INCLUDE)/rpc \
+    $(include_rpc_HEADERS:include/rpc/%.h=$(PROJECT_INCLUDE)/rpc/%.h)
+
+$(PROJECT_INCLUDE)/rpc:
+	@$(mkinstalldirs) $@
+$(PROJECT_INCLUDE)/%.h: include/%.h
+	$(INSTALL_DATA) $< $@
+endif
+
+all-local: $(PREINSTALL_FILES)
+
+EXTRA_DIST = include/rpcsvc/bootparam_prot.x include/rpcsvc/crypt.x \
+    include/rpcsvc/key_prot.x include/rpcsvc/klm_prot.x \
+    include/rpcsvc/mount.x include/rpcsvc/nfs_prot.x include/rpcsvc/nis.x \
+    include/rpcsvc/nis_cache.x include/rpcsvc/nis_callback.x \
+    include/rpcsvc/nis_db.h include/rpcsvc/nis_object.x \
+    include/rpcsvc/nis_tags.h include/rpcsvc/nislib.h \
+    include/rpcsvc/nlm_prot.x include/rpcsvc/pmap_prot.x \
+    include/rpcsvc/rex.x include/rpcsvc/rnusers.x include/rpcsvc/rquota.x \
+    include/rpcsvc/rstat.x include/rpcsvc/rwall.x include/rpcsvc/sm_inter.x \
+    include/rpcsvc/spray.x include/rpcsvc/yp.x include/rpcsvc/yp_prot.h \
+    include/rpcsvc/ypclnt.h include/rpcsvc/yppasswd.x \
+    include/rpcsvc/ypupdate_prot.x include/rpcsvc/ypxfrd.x
+
+EXTRA_DIST += README_RTEMS
 
 include $(top_srcdir)/automake/subdirs.am
 include $(top_srcdir)/automake/local.am
diff --git a/cpukit/librpc/include/Makefile.am b/cpukit/librpc/include/Makefile.am
deleted file mode 100644
index 67e460e45c..0000000000
--- a/cpukit/librpc/include/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-##
-## $Id$
-##
-
-include_rpcdir = $(includedir)/rpc
-
-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/local.am