Revert "LU-1538 tests: keep /sbin/mount.lustre until cleanup"

[fs/lustre-release.git] / lustre / autoMakefile.am

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 039bcc6..efe98f9 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -43,12 +43,10 @@ ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
        mgc fid fld doc utils tests scripts autoconf contrib conf
 
 SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
-       quota osp lod target lfsck
+       quota osp lod target lfsck nodemap
 
 CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
 
-LIBLUSTRE_SUBDIRS = liblustre
-
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
 if SERVER
@@ -59,20 +57,11 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-# this needs to be after the client subdirs
-if LIBLUSTRE
-if !CLIENT
-SUBDIRS += $(CLIENT_SUBDIRS)
-endif
-SUBDIRS += $(LIBLUSTRE_SUBDIRS)
-endif
-
-DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)  \
-       $(LIBLUSTRE_SUBDIRS)
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
 
-EXTRA_DIST = BUGS FDL kernel_patches BUILDING
+EXTRA_DIST = BUGS kernel_patches BUILDING
 
-sources: $(LDISKFS) lustre_build_version
+sources: lustre_build_version
 
 all-recursive: lustre_build_version