X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2FautoMakefile.am;h=4165f544149f1cd7109f43a342b65c07a5cd222a;hp=2ecd6c0aaf6759fe6103fcdded0ef7d92bb1c397;hb=ce8735993473c1055038f7422350c96b092d707d;hpb=9ed879b12c07d1f4de2fe55f35318ed8cdd8995c diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am index 2ecd6c0..4165f54 100644 --- 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 -# 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 # @@ -28,7 +24,7 @@ # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # Use is subject to license terms. # -# Copyright (c) 2012, Intel Corporation. +# Copyright (c) 2012, 2014, Intel Corporation. # # @@ -39,30 +35,30 @@ SUBDIRS = linux util DIST_SUBDIRS = linux util -noinst_LIBRARIES= libcfs.a -libcfs_a_SOURCES = user-string.c - -libcfs_a_CPPFLAGS = $(LLCPPFLAGS) -libcfs_a_CFLAGS = $(LLCFLAGS) +noinst_LIBRARIES = libcfs.a +libcfs_a_SOURCES := util/string.c util/nidstrings.c util/param.c +libcfs_a_CPPFLAGS := -D_GNU_SOURCE +libcfs_a_CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 +libcfs_a_CFLAGS := -fPIC if UTILS lib_LIBRARIES = libcfsutil.a -libcfsutil_a_SOURCES = nidstrings.c libcfs_string.c util/parser.c \ - util/l_ioctl.c util/util.c -libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS) -libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1 -endif +libcfsutil_a_SOURCES := util/parser.c util/l_ioctl.c +libcfsutil_a_CPPFLAGS := -D_GNU_SOURCE +libcfsutil_a_CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 +libcfsutil_a_CPPFLAGS += -DLUSTRE_UTILS=1 +libcfsutil_a_CFLAGS := -fPIC +endif # UTILS if MODULES if LINUX modulenet_DATA := libcfs$(KMODEXT) -endif +endif # LINUX 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 user-string.c + workitem.c fail.c libcfs_cpu.c \ + heap.c libcfs_mem.c libcfs_lock.c