From: Andreas Dilger Date: Tue, 5 Jun 2012 18:53:31 +0000 (-0600) Subject: LU-1481 build: quiet warnings due to := assignment X-Git-Tag: 2.2.91~16 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=ca6bdcd8e8d3e01dd4ad56312efa3dd7657e6dda 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: Andreas Dilger Change-Id: I76caedbc1368a0d2fe02137c46b46c36fc3a500c Reviewed-on: http://review.whamcloud.com/3129 Tested-by: Hudson Reviewed-by: Brian J. Murrell Tested-by: Maloo Reviewed-by: Brian Behlendorf Reviewed-by: Oleg Drokin --- diff --git a/build/autoMakefile.am b/build/autoMakefile.am index 21474c7..d6034df 100644 --- a/build/autoMakefile.am +++ b/build/autoMakefile.am @@ -17,4 +17,4 @@ MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ distclean: distclean-recursive @true -SUBDIRS := autoconf +SUBDIRS = autoconf diff --git a/ldiskfs/autoMakefile.am b/ldiskfs/autoMakefile.am index 0120e67..2b5f9ec 100644 --- a/ldiskfs/autoMakefile.am +++ b/ldiskfs/autoMakefile.am @@ -1,6 +1,6 @@ -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 diff --git a/libcfs/autoconf/Makefile.am b/libcfs/autoconf/Makefile.am index 3927b04..78ca57f 100644 --- a/libcfs/autoconf/Makefile.am +++ b/libcfs/autoconf/Makefile.am @@ -1 +1 @@ -EXTRA_DIST := lustre-libcfs.m4 +EXTRA_DIST = lustre-libcfs.m4 diff --git a/libcfs/include/libcfs/Makefile.am b/libcfs/include/libcfs/Makefile.am index 6c79304..645a02e 100644 --- a/libcfs/include/libcfs/Makefile.am +++ b/libcfs/include/libcfs/Makefile.am @@ -1,10 +1,10 @@ -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 \ diff --git a/libcfs/include/libcfs/darwin/Makefile.am b/libcfs/include/libcfs/darwin/Makefile.am index ead910d..318717a 100644 --- a/libcfs/include/libcfs/darwin/Makefile.am +++ b/libcfs/include/libcfs/darwin/Makefile.am @@ -1,3 +1,3 @@ -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 diff --git a/libcfs/include/libcfs/linux/Makefile.am b/libcfs/include/libcfs/linux/Makefile.am index 0a5917f..1349217 100644 --- a/libcfs/include/libcfs/linux/Makefile.am +++ b/libcfs/include/libcfs/linux/Makefile.am @@ -1,3 +1,3 @@ -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 diff --git a/libcfs/include/libcfs/posix/Makefile.am b/libcfs/include/libcfs/posix/Makefile.am index 609bb0c..957f156 100644 --- a/libcfs/include/libcfs/posix/Makefile.am +++ b/libcfs/include/libcfs/posix/Makefile.am @@ -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 diff --git a/libcfs/include/libcfs/util/Makefile.am b/libcfs/include/libcfs/util/Makefile.am index 6d68892..2a1e9bf 100644 --- a/libcfs/include/libcfs/util/Makefile.am +++ b/libcfs/include/libcfs/util/Makefile.am @@ -1 +1 @@ -EXTRA_DIST := parser.h platform.h libcfsutil_ioctl.h +EXTRA_DIST = parser.h platform.h libcfsutil_ioctl.h diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am index 33b7ec6..0e7819c 100644 --- a/libcfs/libcfs/autoMakefile.am +++ b/libcfs/libcfs/autoMakefile.am @@ -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 diff --git a/libcfs/libcfs/darwin/Makefile.am b/libcfs/libcfs/darwin/Makefile.am index 3f2077b..a389486 100644 --- a/libcfs/libcfs/darwin/Makefile.am +++ b/libcfs/libcfs/darwin/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST := \ +EXTRA_DIST = \ darwin-mem.c \ darwin-proc.c \ darwin-utils.c \ diff --git a/libcfs/libcfs/linux/Makefile.am b/libcfs/libcfs/linux/Makefile.am index 1ca6b4d..bb75462 100644 --- a/libcfs/libcfs/linux/Makefile.am +++ b/libcfs/libcfs/linux/Makefile.am @@ -1,8 +1,5 @@ -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 - - - diff --git a/libcfs/libcfs/posix/Makefile.am b/libcfs/libcfs/posix/Makefile.am index ebabae3..185710f 100644 --- a/libcfs/libcfs/posix/Makefile.am +++ b/libcfs/libcfs/posix/Makefile.am @@ -1,2 +1,2 @@ -EXTRA_DIST := posix-debug.c +EXTRA_DIST = posix-debug.c diff --git a/libcfs/libcfs/util/Makefile.am b/libcfs/libcfs/util/Makefile.am index 74e14889..9194671 100644 --- a/libcfs/libcfs/util/Makefile.am +++ b/libcfs/libcfs/util/Makefile.am @@ -1,2 +1 @@ -EXTRA_DIST := parser.c l_ioctl.c util.c - +EXTRA_DIST = parser.c l_ioctl.c util.c diff --git a/lnet/autoconf/Makefile.am b/lnet/autoconf/Makefile.am index 2c72c6e..426c3ce 100644 --- a/lnet/autoconf/Makefile.am +++ b/lnet/autoconf/Makefile.am @@ -1 +1 @@ -EXTRA_DIST := ofed.m4 lustre-lnet.m4 +EXTRA_DIST = ofed.m4 lustre-lnet.m4 diff --git a/lnet/include/lnet/Makefile.am b/lnet/include/lnet/Makefile.am index 9b60bbd..cc28f14 100644 --- a/lnet/include/lnet/Makefile.am +++ b/lnet/include/lnet/Makefile.am @@ -1,10 +1,10 @@ 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 \ diff --git a/lnet/include/lnet/darwin/Makefile.am b/lnet/include/lnet/darwin/Makefile.am index 409e159..29df720 100644 --- a/lnet/include/lnet/darwin/Makefile.am +++ b/lnet/include/lnet/darwin/Makefile.am @@ -1 +1 @@ -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 diff --git a/lnet/include/lnet/linux/Makefile.am b/lnet/include/lnet/linux/Makefile.am index 409e159..29df720 100644 --- a/lnet/include/lnet/linux/Makefile.am +++ b/lnet/include/lnet/linux/Makefile.am @@ -1 +1 @@ -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 diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am index 9f6fca1..ea8861b 100644 --- a/lnet/klnds/socklnd/autoMakefile.am +++ b/lnet/klnds/socklnd/autoMakefile.am @@ -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) diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am index 298e17d..86682f1 100644 --- a/lnet/lnet/autoMakefile.am +++ b/lnet/lnet/autoMakefile.am @@ -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 diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am index 31b6109..b0a028c 100644 --- a/lustre/autoMakefile.am +++ b/lustre/autoMakefile.am @@ -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) diff --git a/lustre/autoconf/Makefile.am b/lustre/autoconf/Makefile.am index 78a6511..d229901 100644 --- a/lustre/autoconf/Makefile.am +++ b/lustre/autoconf/Makefile.am @@ -1 +1 @@ -EXTRA_DIST := lustre-core.m4 lustre-version.ac kerberos5.m4 +EXTRA_DIST = lustre-core.m4 lustre-version.ac kerberos5.m4 diff --git a/lustre/include/Makefile.am b/lustre/include/Makefile.am index 7d58aa4..d0a1197 100644 --- a/lustre/include/Makefile.am +++ b/lustre/include/Makefile.am @@ -36,7 +36,7 @@ SUBDIRS = linux lustre -DIST_SUBDIRS := linux lustre darwin +DIST_SUBDIRS = linux lustre darwin EXTRA_DIST = ioctl.h liblustre.h lprocfs_status.h lustre_cfg.h \ lustre_debug.h lustre_disk.h lustre_dlm.h lustre_export.h \ diff --git a/lustre/liblustre/tests/Makefile.am b/lustre/liblustre/tests/Makefile.am index 5381c57..73b9667 100644 --- a/lustre/liblustre/tests/Makefile.am +++ b/lustre/liblustre/tests/Makefile.am @@ -25,7 +25,7 @@ liblustre_test_LIBRARIES = $(noinst_LIBRARIES) endif # LIBLUSTRE_TESTS endif # LIBLUSTRE -DIST_SUBDIRS := mpi +DIST_SUBDIRS = mpi libtestcommon_a_SOURCES = test_common.c test_common.h diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/autoMakefile.am index beb94e2..01120dc 100644 --- a/lustre/lov/autoMakefile.am +++ b/lustre/lov/autoMakefile.am @@ -47,36 +47,36 @@ modulefs_DATA = lov$(KMODEXT) endif if DARWIN -macos_PROGRAMS := lov +macos_PROGRAMS = lov -lov_SOURCES := \ - lov_log.c \ - lov_pool.c \ - lov_obd.c \ - lov_pack.c \ - lov_request.c \ - lov_merge.c \ - lov_qos.c \ - lov_dev.c \ - lov_object.c \ - lov_page.c \ - lov_lock.c \ - lov_io.c \ - lovsub_dev.c \ - lovsub_object.c \ - lovsub_page.c \ - lovsub_lock.c \ - lovsub_io.c \ - lov_offset.c \ - lov_internal.h +lov_SOURCES = \ + lov_log.c \ + lov_pool.c \ + lov_obd.c \ + lov_pack.c \ + lov_request.c \ + lov_merge.c \ + lov_qos.c \ + lov_dev.c \ + lov_object.c \ + lov_page.c \ + lov_lock.c \ + lov_io.c \ + lovsub_dev.c \ + lovsub_object.c \ + lovsub_page.c \ + lovsub_lock.c \ + lovsub_io.c \ + lov_offset.c \ + lov_internal.h lov_CFLAGS := $(EXTRA_KCFLAGS) lov_LDFLAGS := $(EXTRA_KLDFLAGS) lov_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 diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am index 4d362a9..c684b50 100644 --- a/lustre/lvfs/autoMakefile.am +++ b/lustre/lvfs/autoMakefile.am @@ -76,17 +76,17 @@ endif # LINUX if DARWIN -macos_PROGRAMS := lvfs +macos_PROGRAMS = lvfs -lvfs_SOURCES := lvfs_darwin.c +lvfs_SOURCES = lvfs_darwin.c lvfs_CFLAGS := $(EXTRA_KCFLAGS) lvfs_LDFLAGS := $(EXTRA_KLDFLAGS) lvfs_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 diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am index f7cc4d1..7b01cfb 100644 --- a/lustre/obdclass/autoMakefile.am +++ b/lustre/obdclass/autoMakefile.am @@ -1,8 +1,8 @@ -SUBDIRS := linux +SUBDIRS = linux if DARWIN SUBDIRS += darwin endif -DIST_SUBDIRS := linux darwin +DIST_SUBDIRS = linux darwin if LIBLUSTRE INCLUDES = -I$(SYSIO)/include @@ -28,23 +28,23 @@ noinst_DATA = llog_test$(KMODEXT) endif # LINUX if DARWIN -macos_PROGRAMS := obdclass +macos_PROGRAMS = obdclass -obdclass_SOURCES := \ - darwin/darwin-module.c darwin/darwin-sysctl.c \ - class_obd.c genops.c lprocfs_status.c \ - lustre_handles.c lustre_peer.c obd_config.c \ - obdo.c debug.c llog_ioctl.c uuid.c \ - llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c \ - mea.c lu_object.c dt_object.c lu_ref.c +obdclass_SOURCES = \ + darwin/darwin-module.c darwin/darwin-sysctl.c \ + class_obd.c genops.c lprocfs_status.c \ + lustre_handles.c lustre_peer.c obd_config.c \ + obdo.c debug.c llog_ioctl.c uuid.c \ + llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c \ + mea.c lu_object.c dt_object.c lu_ref.c obdclass_CFLAGS := $(EXTRA_KCFLAGS) obdclass_LDFLAGS := $(EXTRA_KLDFLAGS) obdclass_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 diff --git a/lustre/obdclass/darwin/Makefile.am b/lustre/obdclass/darwin/Makefile.am index 75ba623..77480f6 100644 --- a/lustre/obdclass/darwin/Makefile.am +++ b/lustre/obdclass/darwin/Makefile.am @@ -1,3 +1,3 @@ -EXTRA_DIST := \ +EXTRA_DIST = \ darwin-module.c \ darwin-sysctl.c diff --git a/lustre/obdclass/linux/Makefile.am b/lustre/obdclass/linux/Makefile.am index bf95892..2998055 100644 --- a/lustre/obdclass/linux/Makefile.am +++ b/lustre/obdclass/linux/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST := \ - linux-module.c \ - linux-sysctl.c \ +EXTRA_DIST = \ + linux-module.c \ + linux-sysctl.c \ linux-obdo.c diff --git a/lustre/obdecho/autoMakefile.am b/lustre/obdecho/autoMakefile.am index 34d4244..20e02df 100644 --- a/lustre/obdecho/autoMakefile.am +++ b/lustre/obdecho/autoMakefile.am @@ -47,10 +47,10 @@ modulefs_DATA = obdecho$(KMODEXT) endif if DARWIN -macos_PROGRAMS := obdecho -obdecho_SOURCES := \ - lproc_echo.c \ - echo_client.c +macos_PROGRAMS = obdecho +obdecho_SOURCES = \ + lproc_echo.c \ + echo_client.c if SERVER obdecho_SOURCES += echo.c @@ -60,9 +60,9 @@ obdecho_CFLAGS := $(EXTRA_KCFLAGS) obdecho_LDFLAGS := $(EXTRA_KLDFLAGS) obdecho_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 diff --git a/lustre/osc/autoMakefile.am b/lustre/osc/autoMakefile.am index e93e90d..bc2da16 100644 --- a/lustre/osc/autoMakefile.am +++ b/lustre/osc/autoMakefile.am @@ -51,26 +51,26 @@ modulefs_DATA = osc$(KMODEXT) endif if DARWIN -macos_PROGRAMS := osc +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_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 +plist_DATA = Info.plist -install_data_hook := fix-kext-ownership +install_data_hook = fix-kext-ownership endif # Darwin diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/autoMakefile.am index b34cc25..692d5e7 100644 --- a/lustre/ptlrpc/autoMakefile.am +++ b/lustre/ptlrpc/autoMakefile.am @@ -70,43 +70,43 @@ 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_bulk.c \ - sec_gc.c \ - sec_config.c \ - sec_lproc.c \ - sec_null.c \ - sec_plain.c \ - $(LDLM_COMM_SOURCES) +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_bulk.c \ + sec_gc.c \ + sec_config.c \ + sec_lproc.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 +plist_DATA = Info.plist -install_data_hook := fix-kext-ownership +install_data_hook = fix-kext-ownership endif # DARWIN diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index f8a8765..c8dd697 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -2,9 +2,9 @@ AM_CPPFLAGS = $(LLCPPFLAGS) -I/opt/lam/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS AM_CFLAGS = $(LLCFLAGS) # LDADD = -lldap -# LDADD := -lreadline -ltermcap # -lefence +# LDADD = -lreadline -ltermcap # -lefence -DIST_SUBDIRS := mpi +DIST_SUBDIRS = mpi noinst_DATA = disk1_8.tar.bz2 noinst_SCRIPTS = leak_finder.pl llmount.sh llmountcleanup.sh functions.sh diff --git a/lustre/utils/gss/Makefile.am b/lustre/utils/gss/Makefile.am index 180b98f..fdf2acc 100644 --- a/lustre/utils/gss/Makefile.am +++ b/lustre/utils/gss/Makefile.am @@ -8,7 +8,7 @@ AM_LDFLAGS := -L$(top_builddir)/libcfs/libcfs LIBCFS := $(top_builddir)/libcfs/libcfs/libcfs.a $(top_builddir)/libcfs/libcfs/libcfsutil.a -sbin_PROGRAMS := lsvcgssd l_idmap +sbin_PROGRAMS = lsvcgssd l_idmap if GSS_KEYRING sbin_PROGRAMS += lgss_keyring diff --git a/snmp/Makefile.am b/snmp/Makefile.am index 40658ab..fe2a153 100644 --- a/snmp/Makefile.am +++ b/snmp/Makefile.am @@ -1,7 +1,7 @@ -agent_PROGRAMS := lustresnmp.so -mib_DATA := Lustre-MIB.txt +agent_PROGRAMS = lustresnmp.so +mib_DATA = Lustre-MIB.txt -lustresnmp_so_SOURCES := \ +lustresnmp_so_SOURCES = \ lustre-snmp.c \ lustre-snmp.h \ lustre-snmp-trap.c \ @@ -11,9 +11,9 @@ lustresnmp_so_SOURCES := \ lustresnmp_so_LDADD := $(NET_SNMP_LIBS) lustresnmp_so_CFLAGS := -fPIC $(NET_SNMP_CFLAGS) -lustresnmp_so_LDFLAGS := -fPIC -shared +lustresnmp_so_LDFLAGS = -fPIC -shared -SUBDIRS := -DIST_SUBDIRS := autoconf +SUBDIRS = +DIST_SUBDIRS = autoconf -EXTRA_DIST := $(mib_DATA) +EXTRA_DIST = $(mib_DATA) diff --git a/snmp/autoconf/Makefile.am b/snmp/autoconf/Makefile.am index 2bb7693..c1eec13 100644 --- a/snmp/autoconf/Makefile.am +++ b/snmp/autoconf/Makefile.am @@ -1 +1 @@ -EXTRA_DIST := lustre-snmp.m4 +EXTRA_DIST = lustre-snmp.m4