subdir-m += fid
-subdir-m += lvfs
subdir-m += obdclass
-subdir-m += lov
subdir-m += ptlrpc
-subdir-m += osc
subdir-m += obdecho
subdir-m += mgc
-@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd osd
-@CLIENT_TRUE@subdir-m += mdc lmv llite fld
-@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@