- ldlm builds as part of ptlrpc

diff --git a/lustre/Makefile.mk b/lustre/Makefile.mk
index 9d11539..9e1a9dd 100644 (file)
--- a/lustre/Makefile.mk
+++ b/lustre/Makefile.mk
@@ -7,7 +7,6 @@ obj-y += portals/
 # obdclass has to come before anything that does class_register..
 obj-y += obdclass/
 obj-y += ptlrpc/
-obj-y += ldlm/
 obj-y += obdfilter/
 obj-y += mdc/
 obj-y += mds/

diff --git a/lustre/ptlrpc/Makefile.mk b/lustre/ptlrpc/Makefile.mk
index 888e1bc..4154582 100644 (file)
--- a/lustre/ptlrpc/Makefile.mk
+++ b/lustre/ptlrpc/Makefile.mk
@@ -6,7 +6,12 @@
 include $(src)/../portals/Kernelenv
 
 obj-y += ptlrpc.o
+
 ptlrpc-objs := recover.o connection.o ptlrpc_module.o events.o service.o \
                client.o niobuf.o pack_generic.o lproc_ptlrpc.o pinger.o \
                recov_thread.o import.o llog_net.o llog_client.o \
-               llog_server.o ptlrpcd.o
+               llog_server.o ptlrpcd.o ../ldlm/l_lock.o ../ldlm/ldlm_lock.o \
+               ../ldlm/ldlm_resource.o ../ldlm/ldlm_extent.o \
+               ../ldlm/ldlm_request.o ../ldlm/ldlm_lockd.o \
+               ../ldlm/ldlm_lib.o ../ldlm/ldlm_flock.o ../ldlm/ldlm_plain.o
+