add conf-sanity.sh to acceptance-small.sh

[fs/lustre-release.git] / lustre / ptlrpc / Makefile.am

diff --git a/lustre/ptlrpc/Makefile.am b/lustre/ptlrpc/Makefile.am
index 446f110..2c6de45 100644 (file)
--- a/lustre/ptlrpc/Makefile.am
+++ b/lustre/ptlrpc/Makefile.am
@@ -5,15 +5,34 @@
 
 DEFS=
 
+LDLMSOURCES= $(top_srcdir)/ldlm/l_lock.c $(top_srcdir)/ldlm/ldlm_lock.c \
+   $(top_srcdir)/ldlm/ldlm_resource.c $(top_srcdir)/ldlm/ldlm_lib.c     \
+   $(top_srcdir)/ldlm/ldlm_plain.c $(top_srcdir)/ldlm/ldlm_extent.c     \
+   $(top_srcdir)/ldlm/ldlm_flock.c $(top_srcdir)/ldlm/ldlm_request.c    \
+   $(top_srcdir)/ldlm/ldlm_lockd.c $(top_srcdir)/ldlm/ldlm_internal.h
+
+COMMON_SOURCES =  client.c recover.c connection.c niobuf.c pack_generic.c \
+    events.c ptlrpc_module.c service.c pinger.c recov_thread.c llog_net.c \
+    llog_client.c import.c ptlrpcd.c $(LDLMSOURCES)
+
 if LIBLUSTRE
+
 lib_LIBRARIES = libptlrpc.a
-libptlrpc_a_SOURCES = client.c niobuf.c pack_generic.c recovd.c recover.c connection.c rpc.c events.c  # lproc_ptlrpc.c service.c
+libptlrpc_a_SOURCES = $(COMMON_SOURCES)
+
 else
+
 MODULE = ptlrpc
 modulefs_DATA = ptlrpc.o
 EXTRA_PROGRAMS = ptlrpc
 
-ptlrpc_SOURCES = recovd.c recover.c connection.c rpc.c events.c service.c client.c niobuf.c pack_generic.c lproc_ptlrpc.c
+ptlrpc_SOURCES = $(COMMON_SOURCES) lproc_ptlrpc.c ptlrpc_internal.h \
+    llog_server.c
 endif
 
+ptlrpc_DEPENDENCIES=symlinks
+
+symlinks:
+       ln -sf $(subst /ldlm/,/ptlrpc/,$(addsuffix .o,$(basename $(LDLMSOURCES)))) ../ldlm
+
 include $(top_srcdir)/Rules