LU-2068 build: Respect "--without-ldiskfs" option

[fs/lustre-release.git] / lustre / Makefile.in

diff --git a/lustre/Makefile.in b/lustre/Makefile.in
index d383f48..ada560b 100644 (file)
--- a/lustre/Makefile.in
+++ b/lustre/Makefile.in
@@ -1,22 +1,17 @@
-@LDISKFS_TRUE@subdir-m  += ldiskfs
-
+subdir-m += fid
 subdir-m += lvfs
 subdir-m += obdclass
-subdir-m += sec
 subdir-m += lov
-subdir-m += lmv
 subdir-m += ptlrpc
-subdir-m += obdecho
 subdir-m += osc
-subdir-m += cobd
-subdir-m += cmobd 
-
-@SERVER_TRUE@subdir-m += smfs mds obdfilter ost
-@CLIENT_TRUE@subdir-m += mdc llite
-
-ifeq ($(PATCHLEVEL),4)
-subdir-m += ptlbd
-endif # PATCHLEVEL = 4
+subdir-m += obdecho
+subdir-m += mgc
 
+@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd ofd
+@SERVER_TRUE@subdir-m += quota osp lod
+@CLIENT_TRUE@subdir-m += mdc lmv llite fld
+@LDISKFS_ENABLED_TRUE@subdir-m += osd-ldiskfs
+@ZFS_ENABLED_TRUE@subdir-m += osd-zfs
+@OSDADDON@
 
 @INCLUDE_RULES@