-SUBDIRS = ptlrpc llite lib ldlm obdecho mdc osc extN mds ost
-SUBDIRS+= utils tests obdfilter obdclass obdfs demos doc scripts
-EXTRA_DIST = BUGS FDL Rules include patches
+SUBDIRS = lov utils obdclass ldlm ptlrpc lib obdecho mdc osc ost llite
+SUBDIRS+= $(DIRS24) mds obdfilter tests doc scripts
+
+DIST_SUBDIRS = $(SUBDIRS)
+EXTRA_DIST = BUGS FDL Rules include patches archdep.m4