-subdir-m += osc
-subdir-m += mdc
-subdir-m += mds
-subdir-m += obdfilter
-subdir-m += ost
-subdir-m += llite
-subdir-m += cobd
-
-ifeq ($(PATCHLEVEL),4)
-subdir-m += ptlbd
-endif # PATCHLEVEL = 4
-
-@SNAPFS_TRUE@subdir-m += snapfs
-@SMFS_TRUE@subdir-m += smfs
-@SMFS_TRUE@subdir-m += cmobd
+subdir-m += mgc
+subdir-m += tests/kernel
+
+@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@