-@LDISKFS_TRUE@subdir-m += ldiskfs
-
+subdir-m += fid
subdir-m += lvfs
subdir-m += obdclass
subdir-m += lov
subdir-m += obdecho
subdir-m += mgc
-@SERVER_TRUE@subdir-m += mds obdfilter ost mgs
-@CLIENT_TRUE@subdir-m += mdc llite
-@QUOTA_TRUE@subdir-m += quota
+@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd ofd osd-ldiskfs quota
+@CLIENT_TRUE@subdir-m += mdc lmv llite fld
+@ZFS_ENABLED_TRUE@subdir-m += osd-zfs
@INCLUDE_RULES@