-@LDISKFS_TRUE@subdir-m += ldiskfs
-
+subdir-m += fid
subdir-m += lvfs
subdir-m += obdclass
-subdir-m += sec
subdir-m += lov
-subdir-m += lmv
subdir-m += ptlrpc
-subdir-m += obdecho
subdir-m += osc
-subdir-m += cobd
-subdir-m += cmobd
-
-@SERVER_TRUE@subdir-m += smfs mds obdfilter ost
-@CLIENT_TRUE@subdir-m += mdc llite
-
-ifeq ($(PATCHLEVEL),4)
-subdir-m += ptlbd
-endif # PATCHLEVEL = 4
+subdir-m += obdecho
+subdir-m += mgc
+subdir-m += quota
+@SERVER_TRUE@subdir-m += mds obdfilter ost mgs mdt cmm mdd osd-ldiskfs
+@CLIENT_TRUE@subdir-m += mdc lmv llite fld
@INCLUDE_RULES@