summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-07-08 17:08:05 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-07-08 17:08:05 +0000
commitda0fc5d2ead84ee84a8206da550258264fc9ac42 (patch)
tree646c2451d291aa1705d2e3dae6e301b6ac5823e1 /cpukit
parent2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-da0fc5d2ead84ee84a8206da550258264fc9ac42.tar.bz2
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Merge-in librpc/configure.ac. * Makefile.am: Add librpc to SUBDIRS. Remove @subdirs@.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/Makefile.am3
-rw-r--r--cpukit/configure.ac8
3 files changed, 12 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 30fce88ae2..f1e306f733 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,11 @@
2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * configure.ac: Merge-in librpc/configure.ac.
+ * Makefile.am: Add librpc to SUBDIRS.
+ Remove @subdirs@.
+
+2003-07-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* configure.ac: Merge-in libcsupport/configure.ac.
* Makefile.am: Add libcsupport to SUBDIRS.
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index b5cbd8991b..9a41ac6cad 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -8,8 +8,7 @@ include $(top_srcdir)/automake/multilib.am
SUBDIRS = . include ada score rtems sapi posix itron
SUBDIRS += libcsupport libblock libfs
-SUBDIRS += libnetworking
-SUBDIRS += @subdirs@
+SUBDIRS += libnetworking librpc
SUBDIRS += libmisc
SUBDIRS += wrapup
diff --git a/cpukit/configure.ac b/cpukit/configure.ac
index ecd97da332..823a9ae5bf 100644
--- a/cpukit/configure.ac
+++ b/cpukit/configure.ac
@@ -58,9 +58,6 @@ AC_MSG_CHECKING([whether CPU supports librpc])
* ) LIBRPC=yes;;
esac
AC_MSG_RESULT([$LIBRPC])
- AS_IF([test "$LIBRPC" = "yes"],
- [AC_CONFIG_SUBDIRS([librpc])
- ])
])
AC_ARG_ENABLE([ada],
@@ -248,6 +245,11 @@ libnetworking/Makefile
libnetworking/lib/Makefile
libnetworking/libc/Makefile
libnetworking/wrapup/Makefile
+librpc/Makefile
+librpc/include/Makefile
+librpc/src/Makefile
+librpc/src/xdr/Makefile
+librpc/src/rpc/Makefile
libmisc/Makefile
libmisc/cpuuse/Makefile
libmisc/shell/Makefile