-# NOTE: keep extN before mds
-SUBDIRS = lov utils obdclass ldlm ptlrpc llite lib obdecho mdc osc extN
-SUBDIRS+= mds ost tests obdfilter demos doc scripts
-DIST_SUBDIRS = $(SUBDIRS) obdfs
-EXTRA_DIST = BUGS FDL Rules include patches archdep.m4
+if LINUX25
+DIRS24 =
+else
+DIRS24 = extN ptlbd
+endif
+
+if LIBLUSTRE
+SUBDIRS = lov obdclass ptlrpc obdecho ldlm osc liblustre utils
+else
+# NOTE: keep extN before obdclass, mds, and obdfilter. Keep obdclass as early
+# as possible, to have the best chance at stopping with "wrong kernel version"
+# instead of some related build failure.
+SUBDIRS = $(DIRS24) obdclass mds utils ptlrpc ldlm lib obdfilter mdc osc ost
+SUBDIRS+= llite obdecho lov cobd tests doc scripts conf
+endif
+
+DIST_SUBDIRS = $(SUBDIRS)
+EXTRA_DIST = BUGS FDL Rules include archdep.m4 kernel_patches