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-14487 libcfs: remove references to Sun Trademark.
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
autoMakefile.am
diff --git
a/libcfs/libcfs/autoMakefile.am
b/libcfs/libcfs/autoMakefile.am
index
1bbe71c
..
75ee515
100644
(file)
--- a/
libcfs/libcfs/autoMakefile.am
+++ b/
libcfs/libcfs/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
#
@@
-33,34
+29,35
@@
#
# This file is part of Lustre, http://www.lustre.org/
#
# This file is part of Lustre, http://www.lustre.org/
-# Lustre is a trademark of Sun Microsystems, Inc.
#
SUBDIRS = linux util
DIST_SUBDIRS = linux util
#
SUBDIRS = linux util
DIST_SUBDIRS = linux util
+SUBDIRS += crypto
+DIST_SUBDIRS += crypto
-noinst_LIBRARIES= libcfs.a
-libcfs_a_SOURCES = util/string.c util/nidstrings.c
-
-libcfs_a_CPPFLAGS = $(LLCPPFLAGS)
-libcfs_a_CFLAGS = $(LLCFLAGS)
-
+noinst_LTLIBRARIES = libcfs.la
+libcfs_la_SOURCES := util/string.c util/nidstrings.c util/param.c
if UTILS
if UTILS
-lib_LIBRARIES = libcfsutil.a
-libcfsutil_a_SOURCES = util/parser.c util/l_ioctl.c util/util.c
-libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS)
-libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1
+libcfs_la_SOURCES += util/parser.c util/l_ioctl.c
+endif # UTILS
+libcfs_la_CPPFLAGS := -D_GNU_SOURCE
+libcfs_la_CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64
+if UTILS
+libcfs_la_CPPFLAGS += -DLUSTRE_UTILS=1
endif
endif
+libcfs_la_CFLAGS := -fPIC
if MODULES
if LINUX
modulenet_DATA := libcfs$(KMODEXT)
if MODULES
if LINUX
modulenet_DATA := libcfs$(KMODEXT)
-endif
+endif
# LINUX
endif # MODULES
endif # MODULES
-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o libcfs
-EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h prng.c \
- workitem.c kernel_user_comm.c fail.c libcfs_cpu.c \
- heap.c libcfs_mem.c libcfs_lock.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux/*.o libcfs crypto/*.o
+EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h \
+ workitem.c fail.c libcfs_cpu.c \
+ libcfs_mem.c libcfs_lock.c \
+ linux-crypto.h