From 2b70782511e4c2f1303fa8bff97d0d33ff0b0f3e Mon Sep 17 00:00:00 2001
From: pschwan <pschwan>
Date: Mon, 17 Feb 2003 18:43:45 +0000
Subject: [PATCH] merge b_devel into b_setattr.  highlights: - kernel 2.5 and
 liblustre build changes - fixes to Makefile.am for 7.3-era versions of
 automake, which is quite possibly   the worst piece of software with which I
 come in contact on a daily basis - small unlink fix

---
 lustre/obdecho/Makefile.am | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lustre/obdecho/Makefile.am b/lustre/obdecho/Makefile.am
index ad0e0ff..f8ed503 100644
--- a/lustre/obdecho/Makefile.am
+++ b/lustre/obdecho/Makefile.am
@@ -4,12 +4,17 @@
 # See the file COPYING in this distribution
 
 DEFS= 
+
+if LIBLUSTRE
+lib_LIBRARIES = libobdecho.a
+libobdecho_a_SOURCES = echo_client.c 
+else
 MODULE = obdecho
 modulefs_DATA = obdecho.o
 EXTRA_PROGRAMS = obdecho
-
 LINX=
 obdecho_SOURCES = echo.c echo_client.c lproc_echo.c $(LINX)
+endif
 
 include $(top_srcdir)/Rules
 
-- 
1.8.3.1