X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2FautoMakefile.am;h=8eefa6369721903fcd82bd10b4ed51ae91d3d0ef;hb=e40b008e8877c3345347500d10af07abd8651d56;hp=c50cbcffd42df747050743877fb8224edd95d3a5;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/autoMakefile.am
index c50cbcf..8eefa63 100644
--- a/lustre/ptlrpc/autoMakefile.am
+++ b/lustre/ptlrpc/autoMakefile.am
@@ -1,77 +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
-
-LDLM_COMM_SOURCES= $(top_srcdir)/lustre/ldlm/l_lock.c	\
-	$(top_srcdir)/lustre/ldlm/ldlm_lock.c		\
-	$(top_srcdir)/lustre/ldlm/ldlm_resource.c	\
-	$(top_srcdir)/lustre/ldlm/ldlm_lib.c		\
-	$(top_srcdir)/lustre/ldlm/ldlm_plain.c		\
-	$(top_srcdir)/lustre/ldlm/ldlm_extent.c		\
-	$(top_srcdir)/lustre/ldlm/ldlm_request.c	\
-	$(top_srcdir)/lustre/ldlm/ldlm_lockd.c		\
-	$(top_srcdir)/lustre/ldlm/ldlm_internal.h	\
-	$(top_srcdir)/lustre/ldlm/ldlm_inodebits.c	\
-	$(top_srcdir)/lustre/ldlm/ldlm_flock.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_null.c sec_plain.c      \
-    sec_lproc.c lproc_ptlrpc.c $(LDLM_COMM_SOURCES)
-
-if LIBLUSTRE
+# 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.gnu.org/licenses/gpl-2.0.html
+#
+# GPL HEADER END
+#
 
-noinst_LIBRARIES = libptlrpc.a
-libptlrpc_a_SOURCES = $(COMMON_SOURCES)
-libptlrpc_a_CPPFLAGS = $(LLCPPFLAGS)
-libptlrpc_a_CFLAGS = $(LLCFLAGS)
+#
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+# Use is subject to license terms.
+#
+# Copyright (c) 2012, 2013, Intel Corporation.
+#
 
-endif
+#
+# This file is part of Lustre, http://www.lustre.org/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
 
 if MODULES
 
 if LINUX
 modulefs_DATA = ptlrpc$(KMODEXT)
-endif #LINUX
-
-if DARWIN
-macos_PROGRAMS := ptlrpc
-
-ptlrpc_SOURCES := \
-        ptlrpc_module.c \
-        client.c \
-        connection.c \
-        events.c \
-        import.c \
-        llog_client.c \
-        llog_net.c \
-        llog_server.c \
-        lproc_ptlrpc.c \
-        niobuf.c \
-        pack_generic.c \
-        pers.c \
-        pinger.c \
-        ptlrpcd.c \
-        recover.c \
-        recov_thread.c \
-        service.c \
-	wiretest.c \
-	sec.c \
-	sec_null.c \
-	sec_plain.c \
-        $(LDLM_COMM_SOURCES)
-
-ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
-ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
-ptlrpc_LDADD := $(EXTRA_KLIBS)
-
-plist_DATA := Info.plist
-
-install_data_hook := fix-kext-ownership
-
-endif # DARWIN
+endif # LINUX
 
 endif # MODULES
 
@@ -79,6 +44,4 @@ if GSS
 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