-@LDISKFS_TRUE@subdir-m += ldiskfs
-
+subdir-m += fid
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
+subdir-m += mgc
+@SERVER_TRUE@subdir-m += ost mgs mdt mdd ofd quota osp lod
+@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@