Skip to content
Snippets Groups Projects
Commit ca6bdcd8 authored by Andreas Dilger's avatar Andreas Dilger Committed by Oleg Drokin
Browse files

LU-1481 build: quiet warnings due to := assignment


When running automake to generate Makefiles, newer compilers will
warn about non-portable assignments:

  lvfs/autoMakefile.am:52: `:='-style assignments are not portable

The use of ":=" vs. "=" determines when conditional expressions
are evaluated, but have absolutely no use for constant assignments,
so there is no point in using them at all in that case.

Convert all ":=" to "=" for constant assignments, leaving the
decision to use ":=" for conditional assignments until later.

Signed-off-by: default avatarAndreas Dilger <adilger@whamcloud.com>
Change-Id: I76caedbc1368a0d2fe02137c46b46c36fc3a500c
Reviewed-on: http://review.whamcloud.com/3129


Tested-by: Hudson
Reviewed-by: default avatarBrian J. Murrell <brian@whamcloud.com>
Tested-by: default avatarMaloo <whamcloud.maloo@gmail.com>
Reviewed-by: default avatarBrian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: default avatarOleg Drokin <green@whamcloud.com>
parent fbdd08b9
No related branches found
No related tags found
No related merge requests found
Showing
with 49 additions and 52 deletions
......@@ -17,4 +17,4 @@ MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
distclean: distclean-recursive
@true
SUBDIRS := autoconf
SUBDIRS = autoconf
SUBDIRS := . ldiskfs
SOURCES_SUBDIRS := ldiskfs
DIST_SUBDIRS := ldiskfs
SUBDIRS = . ldiskfs
SOURCES_SUBDIRS = ldiskfs
DIST_SUBDIRS = ldiskfs
# this is in fact irrelevant in this file but needed to keep
# autoMakefile.am.toplevel happy
......
EXTRA_DIST := lustre-libcfs.m4
EXTRA_DIST = lustre-libcfs.m4
SUBDIRS := linux posix util
SUBDIRS = linux posix util
if DARWIN
SUBDIRS += darwin
endif
DIST_SUBDIRS := linux posix util darwin
DIST_SUBDIRS = linux posix util darwin
EXTRA_DIST := curproc.h libcfs_private.h libcfs.h list.h lltrace.h \
EXTRA_DIST = curproc.h libcfs_private.h libcfs.h list.h lltrace.h \
user-lock.h user-prim.h user-time.h user-mem.h \
user-tcpip.h user-bitops.h bitmap.h user-crypto.h \
libcfs_prim.h libcfs_time.h libcfs_hash.h libcfs_cpu.h \
......
EXTRA_DIST := darwin-mem.h darwin-types.h libcfs.h \
EXTRA_DIST = darwin-mem.h darwin-types.h libcfs.h \
darwin-fs.h darwin-prim.h darwin-utils.h lltrace.h \
darwin-lock.h darwin-sync.h darwin-tcpip.h kp30.h
EXTRA_DIST := kp30.h libcfs.h linux-fs.h linux-lock.h linux-mem.h \
linux-prim.h linux-time.h linux-tcpip.h lltrace.h linux-cpu.h \
EXTRA_DIST = kp30.h libcfs.h linux-fs.h linux-lock.h linux-mem.h \
linux-prim.h linux-time.h linux-tcpip.h lltrace.h linux-cpu.h \
portals_compat25.h linux-bitops.h linux-types.h linux-crypto.h
......@@ -4,4 +4,4 @@ if UTILS
libcfsposix_HEADERS = posix-types.h
endif
EXTRA_DIST := libcfs.h posix-wordsize.h posix-types.h posix-crypto.h
EXTRA_DIST = libcfs.h posix-wordsize.h posix-types.h posix-crypto.h
EXTRA_DIST := parser.h platform.h libcfsutil_ioctl.h
EXTRA_DIST = parser.h platform.h libcfsutil_ioctl.h
......@@ -28,24 +28,26 @@
# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# Copyright (c) 2012, Whamcloud, Inc.
#
#
# This file is part of Lustre, http://www.lustre.org/
# Lustre is a trademark of Sun Microsystems, Inc.
#
SUBDIRS := linux util posix
SUBDIRS = linux util posix
if DARWIN
SUBDIRS += darwin
endif
DIST_SUBDIRS := linux util posix darwin
DIST_SUBDIRS = linux util posix darwin
if LIBLUSTRE
noinst_LIBRARIES= libcfs.a
libcfs_a_SOURCES= posix/posix-debug.c user-prim.c user-lock.c user-tcpip.c \
libcfs_a_SOURCES= posix/posix-debug.c user-prim.c user-lock.c user-tcpip.c \
prng.c user-bitops.c user-mem.c hash.c kernel_user_comm.c \
workitem.c fail.c libcfs_cpu.c libcfs_mem.c libcfs_lock.c \
posix/rbtree.c user-crypto.c posix/posix-crc32.c \
posix/rbtree.c user-crypto.c posix/posix-crc32.c \
posix/posix-adler.c
if ARCH_x86
......@@ -57,9 +59,9 @@ libcfs_a_CFLAGS = $(LLCFLAGS)
endif
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_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
if MODULES
......@@ -69,9 +71,9 @@ modulenet_DATA := libcfs$(KMODEXT)
endif
if DARWIN
macos_PROGRAMS := libcfs
macos_PROGRAMS = libcfs
nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c \
nodist_libcfs_SOURCES = darwin/darwin-sync.c darwin/darwin-mem.c \
darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c \
darwin/darwin-tcpip.c darwin/darwin-utils.c \
darwin/darwin-debug.c darwin/darwin-proc.c \
......@@ -83,9 +85,9 @@ libcfs_CFLAGS := $(EXTRA_KCFLAGS)
libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
libcfs_LDADD := $(EXTRA_KLIBS)
plist_DATA := Info.plist
plist_DATA = Info.plist
install_data_hook := fix-kext-ownership
install_data_hook = fix-kext-ownership
endif
......
EXTRA_DIST := \
EXTRA_DIST = \
darwin-mem.c \
darwin-proc.c \
darwin-utils.c \
......
EXTRA_DIST := linux-debug.c linux-lwt.c linux-prim.c linux-tracefile.c \
EXTRA_DIST = linux-debug.c linux-lwt.c linux-prim.c linux-tracefile.c \
linux-fs.c linux-mem.c linux-proc.c linux-utils.c linux-lock.c \
linux-module.c linux-sync.c linux-curproc.c linux-tcpip.c \
linux-cpu.c linux-crypto.c linux-crypto-crc32.c linux-crypto-adler.c \
linux-crypto-crc32pclmul.c
EXTRA_DIST := posix-debug.c
EXTRA_DIST = posix-debug.c
EXTRA_DIST := parser.c l_ioctl.c util.c
EXTRA_DIST = parser.c l_ioctl.c util.c
EXTRA_DIST := ofed.m4 lustre-lnet.m4
EXTRA_DIST = ofed.m4 lustre-lnet.m4
lnetdir=$(includedir)/lnet
SUBDIRS := linux
SUBDIRS = linux
if DARWIN
SUBDIRS += darwin
endif
DIST_SUBDIRS := linux darwin
DIST_SUBDIRS = linux darwin
EXTRA_DIST = api.h api-support.h \
lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
......
EXTRA_DIST := lib-lnet.h lib-types.h lnet.h api-support.h
EXTRA_DIST = lib-lnet.h lib-types.h lnet.h api-support.h
EXTRA_DIST := lib-lnet.h lib-types.h lnet.h api-support.h
EXTRA_DIST = lib-lnet.h lib-types.h lnet.h api-support.h
......@@ -9,19 +9,18 @@ endif # MODULES
EXTRA_DIST := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
if DARWIN
macos_PROGRAMS = ksocklnd
macos_PROGRAMS := ksocklnd
nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
nodist_ksocklnd_SOURCES = socklnd.c socklnd_cb.c socklnd_proto.c
nodist_ksocklnd_SOURCES += socklnd_modparams.c socklnd_lib-darwin.c
EXTRA_DIST += socklnd_lib-darwin.c socklnd_lib-darwin.h
ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
ksocklnd_LDADD := $(EXTRA_KLIBS)
plist_DATA := Info.plist
install_data_hook := fix-kext-ownership
plist_DATA = Info.plist
install_data_hook = fix-kext-ownership
endif # DARWIN
EXTRA_DIST += $(plist_DATA)
......
......@@ -19,10 +19,10 @@ modulenet_DATA = lnet$(KMODEXT)
endif # LINUX
if DARWIN
macos_PROGRAMS := lnet
macos_PROGRAMS = lnet
lnet_SOURCES := api-errno.c api-ni.c config.c
lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c lib-ptl.c
lnet_SOURCES = api-errno.c api-ni.c config.c
lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
lnet_SOURCES += acceptor.c peer.c
......@@ -30,9 +30,9 @@ lnet_CFLAGS := $(EXTRA_KCFLAGS)
lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
lnet_LDADD := $(EXTRA_KLIBS)
plist_DATA := Info.plist
plist_DATA = Info.plist
install_data_hook := fix-kext-ownership
install_data_hook = fix-kext-ownership
endif # DARWIN
......
......@@ -39,14 +39,14 @@
AUTOMAKE_OPTIONS = foreign
# also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
ALWAYS_SUBDIRS := include lvfs obdclass ldlm ptlrpc osc lov obdecho \
ALWAYS_SUBDIRS = include lvfs obdclass ldlm ptlrpc osc lov obdecho \
mgc fid fld doc utils tests scripts autoconf contrib conf
SERVER_SUBDIRS := obdfilter ost mds mgs mdt cmm mdd ofd osd-zfs osd-ldiskfs quota
SERVER_SUBDIRS = obdfilter ost mds mgs mdt cmm mdd ofd osd-zfs osd-ldiskfs quota
CLIENT_SUBDIRS := mdc lmv llite lclient
CLIENT_SUBDIRS = mdc lmv llite lclient
LIBLUSTRE_SUBDIRS := liblustre
LIBLUSTRE_SUBDIRS = liblustre
SUBDIRS := $(ALWAYS_SUBDIRS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment