Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-9679 osc: convert while to for in get_write_extents()
[fs/lustre-release.git]
/
lustre
/
osc
/
autoMakefile.am
diff --git
a/lustre/osc/autoMakefile.am
b/lustre/osc/autoMakefile.am
index
bc2da16
..
db74629
100644
(file)
--- a/
lustre/osc/autoMakefile.am
+++ b/
lustre/osc/autoMakefile.am
@@
-15,11
+15,7
@@
#
# You should have received a copy of the GNU General Public License
# version 2 along with this program; If not, see
#
# 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.
+# http://www.gnu.org/licenses/gpl-2.0.html
#
# GPL HEADER END
#
#
# GPL HEADER END
#
@@
-28,7
+24,7
@@
# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
-# Copyright (c) 2012,
Whamcloud, Inc
.
+# Copyright (c) 2012,
Intel Corporation
.
#
#
#
#
@@
-36,46
+32,12
@@
# Lustre is a trademark of Sun Microsystems, Inc.
#
# Lustre is a trademark of Sun Microsystems, Inc.
#
-if LIBLUSTRE
-noinst_LIBRARIES = libosc.a
-libosc_a_SOURCES = osc_request.c osc_create.c osc_internal.h osc_cl_internal.h osc_dev.c osc_object.c osc_page.c osc_lock.c osc_io.c osc_quota.c osc_cache.c
-
-libosc_a_CPPFLAGS = $(LLCPPFLAGS)
-libosc_a_CFLAGS = $(LLCFLAGS)
-endif
-
if MODULES
if LINUX
modulefs_DATA = osc$(KMODEXT)
if MODULES
if LINUX
modulefs_DATA = osc$(KMODEXT)
-endif
-
-if DARWIN
-macos_PROGRAMS = osc
-
-osc_SOURCES = \
- osc_create.c \
- osc_dev.c \
- osc_object.c \
- osc_page.c \
- osc_lock.c \
- osc_io.c \
- osc_request.c \
- osc_quota.c \
- osc_cache.c
-
-osc_CFLAGS := $(EXTRA_KCFLAGS)
-osc_LDFLAGS := $(EXTRA_KLDFLAGS)
-osc_LDADD := $(EXTRA_KLIBS)
-
-plist_DATA = Info.plist
-
-install_data_hook = fix-kext-ownership
-
-endif # Darwin
-
-endif
+endif # LINUX
-install-data-hook: $(install_data_hook)
+endif # MODULES
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@