X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2FautoMakefile.am;h=b34cc2526d3e30fd0e6ff9b57e4c4c350734296d;hb=20aee71e3b66eb183cddef7a018887078027b815;hp=e098d925d226ae65817fe3f17e375e3ded217a2c;hpb=f83a8d69c1dc128af5c40811d222bd92ee73e437;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/autoMakefile.am
index e098d92..b34cc25 100644
--- a/lustre/ptlrpc/autoMakefile.am
+++ b/lustre/ptlrpc/autoMakefile.am
@@ -1,10 +1,42 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
 #
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
+# GPL HEADER START
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 only,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License version 2 for more details (a copy is included
+# in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU General Public License
+# version 2 along with this program; If not, see
+# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+# GPL HEADER END
+#
+
+#
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Use is subject to license terms.
+#
+
+#
+# This file is part of Lustre, http://www.lustre.org/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
 
 LDLM_COMM_SOURCES= $(top_srcdir)/lustre/ldlm/l_lock.c	\
 	$(top_srcdir)/lustre/ldlm/ldlm_lock.c		\
+	$(top_srcdir)/lustre/ldlm/interval_tree.c       \
 	$(top_srcdir)/lustre/ldlm/ldlm_resource.c	\
 	$(top_srcdir)/lustre/ldlm/ldlm_lib.c		\
 	$(top_srcdir)/lustre/ldlm/ldlm_plain.c		\
@@ -19,8 +51,8 @@ LDLM_COMM_SOURCES= $(top_srcdir)/lustre/ldlm/l_lock.c	\
 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 llog_server.c import.c ptlrpcd.c pers.c wiretest.c   	    \
-    ptlrpc_internal.h layout.c sec.c sec_bulk.c sec_gc.c sec_null.c         \
-    sec_plain.c sec_lproc.c lproc_ptlrpc.c $(LDLM_COMM_SOURCES)
+    ptlrpc_internal.h layout.c sec.c sec_bulk.c sec_gc.c sec_config.c       \
+    sec_lproc.c sec_null.c sec_plain.c lproc_ptlrpc.c $(LDLM_COMM_SOURCES)
 
 if LIBLUSTRE
 
@@ -60,6 +92,10 @@ ptlrpc_SOURCES := \
         service.c \
 	wiretest.c \
 	sec.c \
+	sec_bulk.c \
+	sec_gc.c \
+	sec_config.c \
+	sec_lproc.c \
 	sec_null.c \
 	sec_plain.c \
         $(LDLM_COMM_SOURCES)
@@ -81,5 +117,4 @@ SUBDIRS = gss
 endif
 
 install-data-hook: $(install_data_hook)
-DIST_SOURCES = $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  ldlm_*.c l_lock.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  ldlm_*.c l_lock.c interval_tree.c