land b_smallfix 20040407_1414:

[fs/lustre-release.git] / lustre / portals / Makefile.am

diff --git a/lustre/portals/Makefile.am b/lustre/portals/Makefile.am
index 0083ac1..083edfe 100644 (file)
--- a/lustre/portals/Makefile.am
+++ b/lustre/portals/Makefile.am
@@ -3,17 +3,39 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-EXTRA_DIST = Rules.linux archdep.m4 include 
-DIST_SUBDIRS = libcfs portals knals unals utils tests doc router
+EXTRA_DIST = archdep.m4 build.m4 include 
+
+SUBDIRS = portals
+DIST_SUBDIRS =
 
 if LIBLUSTRE
-SUBDIRS = portals unals utils
+SUBDIRS += unals
 else
+DIST_SUBDIRS += unals
+endif
 
+if MODULES
+SUBDIRS += libcfs
 if CRAY_PORTALS
-SUBDIRS = libcfs tests doc 
-else 
-SUBDIRS = libcfs portals knals unals utils tests doc router
+DIST_SUBDIRS += knals router
+else
+SUBDIRS += knals router
+endif
+SUBDIRS += tests
+else
+DIST_SUBDIRS += libcfs knals router tests
 endif
 
+if DOC
+SUBDIRS += doc
+else
+DIST_SUBDIRS += doc
 endif
+
+if UTILS
+SUBDIRS += utils
+else
+DIST_SUBDIRS += utils
+endif
+
+DIST_SUBDIRS += $(SUBDIRS)