get utils/ building

- use 2.5's nice shared lib helpers to build libptlctl

diff --git a/lnet/Kernelenv.in b/lnet/Kernelenv.in
index c47702f..0be4a5b 100644 (file)
--- a/lnet/Kernelenv.in
+++ b/lnet/Kernelenv.in
@@ -1,2 +1,3 @@
 EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/portals/include
 HOSTCFLAGS := $(EXTRA_CFLAGS)
+LIBREADLINE := @LIBREADLINE@

diff --git a/lustre/Makefile.mk b/lustre/Makefile.mk
index 729bdf9..502c5ec 100644 (file)
--- a/lustre/Makefile.mk
+++ b/lustre/Makefile.mk
@@ -8,3 +8,6 @@ obj-y += obdclass/
 obj-y += obdecho/
 obj-y += mds/
 obj-y += lib/
+
+# portals needs to be before utils/, which links against -lptlctl
+obj-m += utils/

diff --git a/lustre/portals/Kernelenv.in b/lustre/portals/Kernelenv.in
index c47702f..0be4a5b 100644 (file)
--- a/lustre/portals/Kernelenv.in
+++ b/lustre/portals/Kernelenv.in
@@ -1,2 +1,3 @@
 EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/portals/include
 HOSTCFLAGS := $(EXTRA_CFLAGS)
+LIBREADLINE := @LIBREADLINE@