-SUBDIRS = rpc llight lib ldlm obdecho mdc osc mds ost utils tests filterobd
-SUBDIRS+= class ext2obd obdfs obdtrace demos doc scripts extN
-#SUBDIRS+= oraid1 rpctarget inofs rpcclient tests snap
-EXTRA_DIST = BUGS FDL Rules include patches
+
+if LINUX25
+DIRS24 =
+else
+DIRS24 = ptlbd
+endif
+
+if LIBLUSTRE
+SUBDIRS = portals obdclass lov ptlrpc obdecho ldlm osc utils mdc #liblustre
+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 = portals obdclass $(DIRS24) mds utils ldlm obdfilter mdc osc ost
+SUBDIRS+= llite obdecho lov cobd tests doc scripts conf ptlrpc
+endif
+
+DIST_SUBDIRS = $(SUBDIRS) liblustre
+EXTRA_DIST = BUGS FDL Rules include kernel_patches