LU-1770 ptlrpc: introducing OBD_CONNECT_FLOCK_OWNER flag

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

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index 7559ef2..57029c8 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -39,16 +39,15 @@
 AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
-ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
+ALWAYS_SUBDIRS = include lvfs obdclass ldlm ptlrpc obdecho \
        mgc fid fld doc utils tests scripts autoconf contrib conf
 
-SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd osd-ldiskfs
+SERVER_SUBDIRS = ost mds mgs mdt cmm mdd ofd osd-zfs osd-ldiskfs \
+       quota osp lod
 
-CLIENT_SUBDIRS := mdc lmv llite lclient
+CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
 
-QUOTA_SUBDIRS := quota
-
-LIBLUSTRE_SUBDIRS := liblustre
+LIBLUSTRE_SUBDIRS = liblustre
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
@@ -60,8 +59,6 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-SUBDIRS += $(QUOTA_SUBDIRS)
-
 # this needs to be after the client subdirs
 if LIBLUSTRE
 if !CLIENT
@@ -71,7 +68,7 @@ SUBDIRS += $(LIBLUSTRE_SUBDIRS)
 endif
 
 DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)  \
-       $(LIBLUSTRE_SUBDIRS) $(QUOTA_SUBDIRS)
+       $(LIBLUSTRE_SUBDIRS)
 
 EXTRA_DIST = BUGS FDL kernel_patches BUILDING