Update b_multinet

  minor conflicts found in mds/handler.c and niobuf.c

diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am
index a76ff4a..658eaa2 100644 (file)
--- a/lustre/ldlm/Makefile.am
+++ b/lustre/ldlm/Makefile.am
@@ -4,12 +4,20 @@
 # See the file COPYING in this distribution
 
 DEFS= 
+
+if LIBLUSTRE
+lib_LIBRARIES = libldlm.a
+libldlm_a_SOURCES = l_lock.c ldlm_lock.c ldlm_resource.c  \
+ldlm_extent.c ldlm_request.c # ldlm_lockd.c
+else
 MODULE = ldlm
 modulefs_DATA = ldlm.o
 EXTRA_PROGRAMS = ldlm
 
-ldlm_SOURCES = l_lock.c ldlm_lock.c ldlm_resource.c ldlm_lockd.c \
-ldlm_extent.c ldlm_request.c
+ldlm_SOURCES = l_lock.c ldlm_lock.c ldlm_resource.c  \
+ldlm_extent.c ldlm_request.c ldlm_lockd.c
+endif
 
 include $(top_srcdir)/Rules
 
+