From 7540921134f105cb0fd9509eb055efa8519403c4 Mon Sep 17 00:00:00 2001 From: rread Date: Thu, 20 Feb 2003 05:30:40 +0000 Subject: [PATCH] Update b_multinet minor conflicts found in mds/handler.c and niobuf.c --- lustre/ldlm/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am index a76ff4a..658eaa2 100644 --- 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 + -- 1.8.3.1