-subdir-m += portals
-
-@LDISKFS_TRUE@subdir-m += ldiskfs
-
-subdir-m += lvfs
-subdir-m += obdclass
-subdir-m += lov
-subdir-m += lmv
-subdir-m += ptlrpc
-subdir-m += obdecho
-subdir-m += osc
-subdir-m += mdc
-subdir-m += mds
-subdir-m += obdfilter
-subdir-m += ost
-subdir-m += llite
-subdir-m += cobd
-subdir-m += smfs
-subdir-m += cmobd
-
-
-ifeq ($(PATCHLEVEL),4)
-subdir-m += ptlbd
-endif # PATCHLEVEL = 4
-
+obj-m += fid/
+obj-m += obdclass/
+obj-m += ptlrpc/
+obj-m += obdecho/
+obj-m += mgc/
+obj-m += tests/kernel/
+
+@SERVER_TRUE@obj-m += ost/ mgs/ mdt/ mdd/ ofd/ quota/ osp/ lod/ lfsck/
+@CLIENT_TRUE@obj-m += lov/ osc/ mdc/ lmv/ llite/ fld/
+@LDISKFS_ENABLED_TRUE@obj-m += osd-ldiskfs/
+@ZFS_ENABLED_TRUE@obj-m += osd-zfs/
+@OSDADDON@
@INCLUDE_RULES@