land 0.5.20.3 b_devel onto HEAD (b_devel will remain)

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

diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am
index 66b9203..d0c4199 100644 (file)
--- a/lustre/ldlm/Makefile.am
+++ b/lustre/ldlm/Makefile.am
@@ -3,22 +3,22 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-DEFS:= 
+DEFS= 
+
+LDLMSOURCES= l_lock.c ldlm_lock.c ldlm_resource.c  \
+ldlm_extent.c ldlm_request.c ldlm_lockd.c
+
+if LIBLUSTRE
+lib_LIBRARIES = libldlm.a
+libldlm_a_SOURCES = $(LDLMSOURCES)
+else
 MODULE = ldlm
 modulefs_DATA = ldlm.o
 EXTRA_PROGRAMS = ldlm
 
-l_lock.c: 
-       test -e l_lock.c || ln -sf $(top_srcdir)/lib/l_lock.c
-
-LINX=l_lock.c
-
-ldlm_SOURCES = l_lock.c ldlm_lock.c ldlm_resource.c ldlm_test.c ldlm_lockd.c \
-ldlm_extent.c ldlm_request.c
-
-dist-hook:
-       list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done
-
+ldlm_SOURCES = $(LDLMSOURCES)
+endif
 
 include $(top_srcdir)/Rules
 
+