summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2011-05-13 15:34:50 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2011-05-13 15:34:50 +0000
commit3bab08dccfc1c2629aeb8ff7d6bc0cf487e3e9db (patch)
tree795af0caad0e034ed0fbe70ad6abf59259536c59 /cpukit
parent2011-05-13 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff)
downloadrtems-3bab08dccfc1c2629aeb8ff7d6bc0cf487e3e9db.tar.bz2
2011-05-13 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/Makefile.am: Unconditionally descend into src/nfsclient. Include subdirs.am.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/libfs/Makefile.am8
2 files changed, 7 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6a7f1e402c..3b8278a4a4 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-13 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libfs/Makefile.am: Unconditionally descend into src/nfsclient.
+ Include subdirs.am.
+
2011-05-13 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libmisc/devnull/devzero.c, libmisc/devnull/devzero.h: New files.
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index e0122a513f..25429cd36b 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -5,12 +5,7 @@
include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
-# Pick up nfsclient
-if LIBNETWORKING
-NFSCLIENT_SUBDIR= src/nfsclient
-endif
-SUBDIRS = $(NFSCLIENT_SUBDIR)
-DIST_SUBDIRS = $(SUBDIRS)
+SUBDIRS = src/nfsclient
EXTRA_DIST = README
@@ -100,4 +95,5 @@ librfs_a_SOURCES = \
# ---
include $(srcdir)/preinstall.am
+include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am