From 3bab08dccfc1c2629aeb8ff7d6bc0cf487e3e9db Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 13 May 2011 15:34:50 +0000 Subject: =?UTF-8?q?2011-05-13=09Ralf=20Cors=C3=A9pius=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * libfs/Makefile.am: Unconditionally descend into src/nfsclient. Include subdirs.am. --- cpukit/ChangeLog | 5 +++++ cpukit/libfs/Makefile.am | 8 ++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'cpukit') 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 + + * libfs/Makefile.am: Unconditionally descend into src/nfsclient. + Include subdirs.am. + 2011-05-13 Sebastian Huber * 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 -- cgit v1.2.3