-ifeq (@MODULES_TRUE@,)
-
-subdir-m += portals
-
-@LDISKFS_TRUE@subdir-m += ldiskfs
-
+subdir-m += fid
subdir-m += lvfs
subdir-m += obdclass
subdir-m += lov
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
-
-ifeq ($(PATCHLEVEL),4)
-subdir-m += ptlbd
-endif # PATCHLEVEL = 4
-
-@SNAPFS_TRUE@subdir-m += snapfs
-@SMFS_TRUE@subdir-m += smfs
+subdir-m += obdecho
+subdir-m += mgc
+subdir-m += quota
-endif # MODULES_TRUE
+@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd osd
+@CLIENT_TRUE@subdir-m += mdc lmv llite fld
@INCLUDE_RULES@