-@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
+@SERVER_TRUE@subdir-m += quota osp lod
+@CLIENT_TRUE@subdir-m += mdc lmv llite fld
+@ZFS_ENABLED_TRUE@subdir-m += osd-zfs
+@OSDADDON@