X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2FMakefile.in;h=cc625c60af6849e430cc99542a6ee16a2ef30c66;hb=380d5932bd633cc40ff11edcbd0166829b6f419e;hp=3387747aa5638844986b43105f0ab13ca3fb4c2d;hpb=d79fc607ddc94e1b5bfcee6c0ebe4ad6045f2823;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index 3387747..cc625c6 100644
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -1,18 +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 wiretest.o
+
+ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs)
 
 default: all
 
@@ -22,6 +24,6 @@ ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c
 l_lock.c: @LUSTRE@/ldlm/l_lock.c
 	ln -sf $< $@
 
-EXTRA_CFLAGS := -I@LUSTRE@/ldlm
+EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm
 
 @INCLUDE_RULES@