Fix --disable-modules build.

diff --git a/lnet/Makefile.in b/lnet/Makefile.in
index 455eaf4..71d0dc8 100644 (file)
--- a/lnet/Makefile.in
+++ b/lnet/Makefile.in
@@ -1,13 +1,9 @@
-ifeq (@MODULES_TRUE@,)
-
 subdir-m += libcfs
-ifeq (@CRAY_PORTALS_FALSE@,)
-subdir-m += portals
-subdir-m += knals
-subdir-m += router
-subdir-m += tests
-endif # CRAY_PORTALS_FALSE
 
-endif # MODULES
+cray-subdirs += portals
+cray-subdirs += knals
+cray-subdirs += router
+cray-subdirs += tests
+@CRAY_PORTALS_FALSE@subdir-m += $(cray-subdirs)
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/Makefile.in b/lnet/klnds/Makefile.in
index 8b65144..12f0c24 100644 (file)
--- a/lnet/klnds/Makefile.in
+++ b/lnet/klnds/Makefile.in
@@ -1,11 +1,7 @@
-ifeq (@MODULES_TRUE@,)
-
 @BUILD_GMNAL_TRUE@subdir-m += gmnal
 @BUILD_IBNAL_TRUE@subdir-m += ibnal
 @BUILD_QSWNAL_TRUE@subdir-m += qswnal
 @BUILD_SCIMACNAL_TRUE@subdir-m += scimacnal
 subdir-m += socknal
 
-endif # MODULES_TRUE
-
 @INCLUDE_RULES@

diff --git a/lustre/Makefile.in b/lustre/Makefile.in
index 045da85..59849db 100644 (file)
--- a/lustre/Makefile.in
+++ b/lustre/Makefile.in
@@ -1,5 +1,3 @@
-ifeq (@MODULES_TRUE@,)
-
 subdir-m += portals
 
 @LDISKFS_TRUE@subdir-m  += ldiskfs
@@ -24,6 +22,4 @@ endif # PATCHLEVEL = 4
 @SNAPFS_TRUE@subdir-m += snapfs
 @SMFS_TRUE@subdir-m += smfs
 
-endif # MODULES_TRUE
-
 @INCLUDE_RULES@

diff --git a/lustre/portals/Makefile.in b/lustre/portals/Makefile.in
index 455eaf4..71d0dc8 100644 (file)
--- a/lustre/portals/Makefile.in
+++ b/lustre/portals/Makefile.in
@@ -1,13 +1,9 @@
-ifeq (@MODULES_TRUE@,)
-
 subdir-m += libcfs
-ifeq (@CRAY_PORTALS_FALSE@,)
-subdir-m += portals
-subdir-m += knals
-subdir-m += router
-subdir-m += tests
-endif # CRAY_PORTALS_FALSE
 
-endif # MODULES
+cray-subdirs += portals
+cray-subdirs += knals
+cray-subdirs += router
+cray-subdirs += tests
+@CRAY_PORTALS_FALSE@subdir-m += $(cray-subdirs)
 
 @INCLUDE_RULES@

diff --git a/lustre/portals/knals/Makefile.in b/lustre/portals/knals/Makefile.in
index 8b65144..12f0c24 100644 (file)
--- a/lustre/portals/knals/Makefile.in
+++ b/lustre/portals/knals/Makefile.in
@@ -1,11 +1,7 @@
-ifeq (@MODULES_TRUE@,)
-
 @BUILD_GMNAL_TRUE@subdir-m += gmnal
 @BUILD_IBNAL_TRUE@subdir-m += ibnal
 @BUILD_QSWNAL_TRUE@subdir-m += qswnal
 @BUILD_SCIMACNAL_TRUE@subdir-m += scimacnal
 subdir-m += socknal
 
-endif # MODULES_TRUE
-
 @INCLUDE_RULES@