X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2FMakefile.in;h=bbbb5f03e56ff5d2c1e9bb1af9a13a7965201324;hb=5489f50e8a3e9bdcaf5c15e8019717ea46650c47;hp=6b27d3e715075f24d83a67b6d30e183006f547f6;hpb=2dc9c16e770415d56839e1996015fec5fab93f29;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index 6b27d3e7..bbbb5f0 100644
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -1,19 +1,20 @@
 MODULES := ptlrpc
 ifeq ($(PATCHLEVEL),6)
-LDLM := @top_srcdir@/ldlm/
+LDLM := @top_srcdir@/lustre/ldlm/
 else
 LDLM :=
 endif
-ptlrpc-objs := $(LDLM)l_lock.o $(LDLM)ldlm_lock.o 
-ptlrpc-objs += $(LDLM)ldlm_resource.o $(LDLM)ldlm_lib.o
-ptlrpc-objs += $(LDLM)ldlm_plain.o $(LDLM)ldlm_extent.o
-ptlrpc-objs += $(LDLM)ldlm_request.o $(LDLM)ldlm_lockd.o
-ptlrpc-objs += $(LDLM)ldlm_flock.o $(LDLM)ldlm_inodebits.o
-ptlrpc-objs += client.o recover.o connection.o niobuf.o pack_generic.o
-ptlrpc-objs += events.o ptlrpc_module.o service.o pinger.o recov_thread.o
-ptlrpc-objs += llog_net.o llog_client.o llog_server.o import.o ptlrpcd.o
-ptlrpc-objs += pers.o lproc_ptlrpc.o
+ldlm_objs := $(LDLM)l_lock.o $(LDLM)ldlm_lock.o 
+ldlm_objs += $(LDLM)ldlm_resource.o $(LDLM)ldlm_lib.o
+ldlm_objs += $(LDLM)ldlm_plain.o $(LDLM)ldlm_extent.o
+ldlm_objs += $(LDLM)ldlm_request.o $(LDLM)ldlm_lockd.o
+ldlm_objs += $(LDLM)ldlm_flock.o $(LDLM)ldlm_inodebits.o
+ptlrpc_objs := client.o recover.o connection.o niobuf.o pack_generic.o
+ptlrpc_objs += events.o ptlrpc_module.o service.o pinger.o recov_thread.o
+ptlrpc_objs += llog_net.o llog_client.o llog_server.o import.o ptlrpcd.o
+ptlrpc_objs += pers.o lproc_ptlrpc.o
 
+ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs)
 default: all
 
 ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c