From a4ca0128753cde798bbb944168c2469749cd1e96 Mon Sep 17 00:00:00 2001 From: zab Date: Wed, 3 Mar 2004 00:58:30 +0000 Subject: [PATCH] - temporarily disable building some dirs when cray portals are in use - revert the overly aggressive migration of portals/list.h - make sure all builds see -DCRAY_PORTALS. this is gross. - protect the libcfs ioctl registration with __KERNEL__ - avoid portals_nid2str() as it breaks the compiler --- lnet/Makefile.am | 2 +- lustre/portals/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lnet/Makefile.am b/lnet/Makefile.am index 9f6afac..0083ac1 100644 --- a/lnet/Makefile.am +++ b/lnet/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = portals unals utils else if CRAY_PORTALS -SUBDIRS = libcfs unals utils tests doc +SUBDIRS = libcfs tests doc else SUBDIRS = libcfs portals knals unals utils tests doc router endif diff --git a/lustre/portals/Makefile.am b/lustre/portals/Makefile.am index 9f6afac..0083ac1 100644 --- a/lustre/portals/Makefile.am +++ b/lustre/portals/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = portals unals utils else if CRAY_PORTALS -SUBDIRS = libcfs unals utils tests doc +SUBDIRS = libcfs tests doc else SUBDIRS = libcfs portals knals unals utils tests doc router endif -- 1.8.3.1