-@LDISKFS_TRUE@subdir-m += ldiskfs ldiskfs2
-
-subdir-m += lvfs
+subdir-m += fid
subdir-m += obdclass
-subdir-m += lov
subdir-m += ptlrpc
-subdir-m += osc
subdir-m += obdecho
subdir-m += mgc
+subdir-m += tests/kernel
-@SERVER_TRUE@subdir-m += mds obdfilter ost mgs
-@CLIENT_TRUE@subdir-m += mdc llite
-@QUOTA_TRUE@subdir-m += quota
+@SERVER_TRUE@subdir-m += ost mgs mdt mdd ofd quota osp lod lfsck
+@CLIENT_TRUE@subdir-m += lov osc mdc lmv llite fld
+@LDISKFS_ENABLED_TRUE@subdir-m += osd-ldiskfs
+@ZFS_ENABLED_TRUE@subdir-m += osd-zfs
+@OSDADDON@
@INCLUDE_RULES@