X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FautoMakefile.am;h=efe98f9afd4e0e5fa58f2bdee1a3335c7f976a82;hb=8293925e6fe9aeaee3af26cc1780f8e0b9661d0f;hp=684d0e773465db496fe048875f976884eed682cc;hpb=e992a95314f9d6721144d5521ebe795a72bb140a;p=fs%2Flustre-release.git

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 684d0e7..efe98f9 100644
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -28,6 +28,8 @@
 # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright (c) 2011, 2012, Intel Corporation.
+#
 
 #
 # This file is part of Lustre, http://www.lustre.org/
@@ -37,16 +39,13 @@
 AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
-ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
-	mgc fid fld doc utils tests scripts autoconf contrib
-
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd-ldiskfs
-
-CLIENT_SUBDIRS := mdc lmv llite lclient
+ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
+	mgc fid fld doc utils tests scripts autoconf contrib conf
 
-QUOTA_SUBDIRS := quota
+SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
+	quota osp lod target lfsck nodemap
 
-LIBLUSTRE_SUBDIRS := liblustre
+CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
@@ -58,27 +57,11 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-SUBDIRS += $(QUOTA_SUBDIRS)
-
-# 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) $(QUOTA_SUBDIRS)
-
-EXTRA_DIST = BUGS FDL kernel_patches
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
 
-lvfs-sources:
-	$(MAKE) sources -C lvfs
-obdclass-sources:
-	$(MAKE) sources -C obdclass
+EXTRA_DIST = BUGS kernel_patches BUILDING
 
-sources: $(LDISKFS) lvfs-sources obdclass-sources lustre_build_version
+sources: lustre_build_version
 
 all-recursive: lustre_build_version