land v0.9.1 on HEAD, in preparation for a 1.0.x branch

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

diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am
index b4e4cea..768f778 100644 (file)
--- a/lustre/ldlm/Makefile.am
+++ b/lustre/ldlm/Makefile.am
@@ -3,20 +3,16 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-DEFS= 
+#
+# ldlm is built into ptlrpc
+#
 
-LDLMSOURCES= l_lock.c ldlm_lock.c ldlm_resource.c ldlm_lib.c \
-ldlm_extent.c ldlm_request.c ldlm_lockd.c ldlm_internal.h
+DEFS= 
 
 if LIBLUSTRE
 lib_LIBRARIES = libldlm.a
-libldlm_a_SOURCES = $(LDLMSOURCES)
-else
-MODULE = ldlm
-modulefs_DATA = ldlm.o
-EXTRA_PROGRAMS = ldlm
-
-ldlm_SOURCES = $(LDLMSOURCES)
+libldlm_a_SOURCES = l_lock.c ldlm_lock.c ldlm_resource.c ldlm_lib.c \
+  ldlm_plain.c ldlm_extent.c ldlm_request.c ldlm_lockd.c ldlm_internal.h
 endif
 
 include $(top_srcdir)/Rules