From 88ae427ab69c4984509631e003e04bd4f7c29fc8 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Fri, 22 Jul 2011 13:28:06 -0700 Subject: [PATCH] LU-455 Replace DIST_SOURCES with EXTRA_DIST Resolve autoconf-2.63 warnings mainly by replacing DIST_SOURCES with EXTRA_DIST. Additionally, the non-portable $(shell) contruct was removed from tests/module.mk and the sources simply enumated. Finally, the incorrect EXTRA_SOURCES instance was removed from the top level autoMakefile.am. Running automake-1.11 -a -c -W no-portability libcfs/libcfs/autoMakefile.am:92: variable `DIST_SOURCES' is defined but no program or libcfs/libcfs/autoMakefile.am:92: library has `DIST' as canonical name (possible typo) lnet/klnds/mxlnd/autoMakefile.am:44: variable `DIST_SOURCES' is defined but no program or lnet/klnds/mxlnd/autoMakefile.am:44: library has `DIST' as canonical name (possible typo) ... Also, as a result of the above changes, libcfs/libcfs/autoMakefile.am had to be modified in order to allow 'make dist' to succeed. As it turns out, libcfsutils_a_SOURCES was incorrect. That list contained references to nonexistent 'util/[parser|platform].h' files. The assumption is it intended to reference libcfs/include/libcfs/util/[parser|platform].h. To fix the issue, both [parser|platform].h references were removed from the list. This produces a simple solution that maintains consistency with the rest of the build system. The caveat being that libcfsutil.a won't automatically be rebuilt if either of the intended [parser|platform].h files are modified. Change-Id: Ia81eb1e3fc219f6dac4c7da234f7e736754c5440 Signed-off-by: Brian Behlendorf Signed-off-by: Christopher J. Morrone Signed-off-by: Prakash Surya Reviewed-on: http://review.whamcloud.com/1092 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Richard Henwood Tested-by: Richard Henwood Reviewed-by: Brian J. Murrell Reviewed-by: Oleg Drokin --- autoMakefile.am | 5 ++++- build/autoMakefile.am.toplevel | 2 +- libcfs/libcfs/autoMakefile.am | 6 ++---- libsysio/tests/module.mk | 7 ++++++- lnet/klnds/mxlnd/autoMakefile.am | 2 +- lnet/klnds/o2iblnd/autoMakefile.am | 2 +- lnet/klnds/ptllnd/autoMakefile.am | 2 +- lnet/klnds/qswlnd/autoMakefile.am | 2 +- lnet/klnds/ralnd/autoMakefile.am | 2 +- lnet/klnds/socklnd/autoMakefile.am | 6 +++--- lnet/lnet/autoMakefile.am | 4 +--- lnet/selftest/autoMakefile.am | 2 +- lustre/cmm/autoMakefile.am | 2 +- lustre/fid/autoMakefile.am | 2 +- lustre/fld/autoMakefile.am | 2 +- lustre/lmv/autoMakefile.am | 2 +- lustre/mdd/autoMakefile.am | 2 +- lustre/mdt/autoMakefile.am | 2 +- lustre/osd-ldiskfs/autoMakefile.am | 4 ++-- lustre/ptlrpc/gss/autoMakefile.am | 2 +- 20 files changed, 32 insertions(+), 28 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index 8438cdb..ccf30fc 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -4,7 +4,7 @@ SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@ if LDISKFS_ENABLED if !LDISKFS_IN_KERNEL -EXTRA_SOURCES := @SYMVERFILE@ +SYMVERFILE_DEPENDECY := @SYMVERFILE@ endif endif @@ -21,6 +21,9 @@ endif if LDISKFS_ENABLED if !LDISKFS_IN_KERNEL + +EXTRA_DIST += @SYMVERFILE@ + @SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@ touch @SYMVERFILE@ -grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel index 8b72d47..7abcd4e 100644 --- a/build/autoMakefile.am.toplevel +++ b/build/autoMakefile.am.toplevel @@ -50,7 +50,7 @@ doxygen-%: build/doxyfile.% if MODULES sources: all-sources -all-sources: $(EXTRA_SOURCES) +all-sources: $(SYMVERFILE_DEPENDECY) for dir in $(SOURCES_SUBDIRS) ; do \ $(MAKE) sources -C $$dir || exit $$? ; \ done diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am index 1f2b97f..fc5f4f1 100644 --- a/libcfs/libcfs/autoMakefile.am +++ b/libcfs/libcfs/autoMakefile.am @@ -50,7 +50,7 @@ libcfs_a_CFLAGS = $(LLCFLAGS) endif lib_LIBRARIES = libcfsutil.a -libcfsutil_a_SOURCES = nidstrings.c util/parser.c util/parser.h util/platform.h \ +libcfsutil_a_SOURCES = nidstrings.c util/parser.c \ util/l_ioctl.c util/util.c libcfsutil_a_CPPFLAGS = $(LLCPPFLAGS) libcfsutil_a_CFLAGS = $(LLCFLAGS) -DLUSTRE_UTILS=1 @@ -86,9 +86,7 @@ endif install-data-hook: $(install_data_hook) -EXTRA_DIST := Info.plist - MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o darwin/*.o libcfs -DIST_SOURCES := $(libcfs-all-objs:%.o=%.c) tracefile.h prng.c \ +EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) Info.plist tracefile.h prng.c \ user-lock.c user-tcpip.c user-bitops.c user-prim.c workitem.c \ user-mem.c kernel_user_comm.c fail.c linux/linux-tracefile.h diff --git a/libsysio/tests/module.mk b/libsysio/tests/module.mk index 3ed43b0..c23f6bd 100644 --- a/libsysio/tests/module.mk +++ b/libsysio/tests/module.mk @@ -1,2 +1,7 @@ -TESTS_EXTRA = $(shell ls tests/*.[ch]) \ +TESTS_EXTRA = tests/drv_init_all.c tests/startup.c tests/sysio-run-start.c \ + tests/test_chown.c tests/test_copy.c tests/test_fcntl_lock.c \ + tests/test_getcwd.c tests/test.h tests/test_link.c tests/test_list.c \ + tests/test_mkdir.c tests/test_mknod.c tests/test_path.c \ + tests/test_regions.c tests/test_rename.c tests/test_stats.c \ + tests/test_stddir.c tests/test_symlink.c tests/test_unlink.c \ tests/Makefile.am tests/Makefile.in tests/module.mk diff --git a/lnet/klnds/mxlnd/autoMakefile.am b/lnet/klnds/mxlnd/autoMakefile.am index 8a4ea8d..e5efec3 100644 --- a/lnet/klnds/mxlnd/autoMakefile.am +++ b/lnet/klnds/mxlnd/autoMakefile.am @@ -41,4 +41,4 @@ endif endif MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ -DIST_SOURCES = $(kmxlnd-objs:%.o=%.c) mxlnd.h +EXTRA_DIST = $(kmxlnd-objs:%.o=%.c) mxlnd.h diff --git a/lnet/klnds/o2iblnd/autoMakefile.am b/lnet/klnds/o2iblnd/autoMakefile.am index 450a05f..fd4f5c58 100644 --- a/lnet/klnds/o2iblnd/autoMakefile.am +++ b/lnet/klnds/o2iblnd/autoMakefile.am @@ -41,4 +41,4 @@ endif endif MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ -DIST_SOURCES = $(ko2iblnd-objs:%.o=%.c) o2iblnd.h +EXTRA_DIST = $(ko2iblnd-objs:%.o=%.c) o2iblnd.h diff --git a/lnet/klnds/ptllnd/autoMakefile.am b/lnet/klnds/ptllnd/autoMakefile.am index bd8cc9c..1001efd 100755 --- a/lnet/klnds/ptllnd/autoMakefile.am +++ b/lnet/klnds/ptllnd/autoMakefile.am @@ -5,4 +5,4 @@ endif endif MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ -DIST_SOURCES = $(kptllnd-objs:%.o=%.c) ptllnd.h +EXTRA_DIST = $(kptllnd-objs:%.o=%.c) ptllnd.h diff --git a/lnet/klnds/qswlnd/autoMakefile.am b/lnet/klnds/qswlnd/autoMakefile.am index f0a3f91..9a5c168 100644 --- a/lnet/klnds/qswlnd/autoMakefile.am +++ b/lnet/klnds/qswlnd/autoMakefile.am @@ -41,4 +41,4 @@ endif endif MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ -DIST_SOURCES = $(kqswlnd-objs:%.o=%.c) qswlnd.h +EXTRA_DIST = $(kqswlnd-objs:%.o=%.c) qswlnd.h diff --git a/lnet/klnds/ralnd/autoMakefile.am b/lnet/klnds/ralnd/autoMakefile.am index 0092c49..0d79f3a 100644 --- a/lnet/klnds/ralnd/autoMakefile.am +++ b/lnet/klnds/ralnd/autoMakefile.am @@ -41,4 +41,4 @@ endif endif MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ -DIST_SOURCES = $(kralnd-objs:%.o=%.c) ralnd.h +EXTRA_DIST = $(kralnd-objs:%.o=%.c) ralnd.h diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am index d2799c9..9f6fca1 100644 --- a/lnet/klnds/socklnd/autoMakefile.am +++ b/lnet/klnds/socklnd/autoMakefile.am @@ -6,14 +6,14 @@ if LINUX endif # LINUX endif # MODULES -DIST_SOURCES := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h +EXTRA_DIST := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h if DARWIN macos_PROGRAMS := ksocklnd nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c - DIST_SOURCES += socklnd_lib-darwin.c socklnd_lib-darwin.h + EXTRA_DIST += socklnd_lib-darwin.c socklnd_lib-darwin.h ksocklnd_CFLAGS := $(EXTRA_KCFLAGS) ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS) @@ -24,7 +24,7 @@ if DARWIN endif # DARWIN -EXTRA_DIST := $(plist_DATA) +EXTRA_DIST += $(plist_DATA) install-data-hook: $(install_data_hook) MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ socklnd_lib.c diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am index 9ce40fe..4f6d14b 100644 --- a/lnet/lnet/autoMakefile.am +++ b/lnet/lnet/autoMakefile.am @@ -40,7 +40,5 @@ endif # MODULES install-data-hook: $(install_data_hook) -EXTRA_DIST := Info.plist - MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ lnet -DIST_SOURCES = $(lnet-objs:%.o=%.c) +EXTRA_DIST = $(lnet-objs:%.o=%.c) Info.plist diff --git a/lnet/selftest/autoMakefile.am b/lnet/selftest/autoMakefile.am index 24d92bcd1..0688f16 100644 --- a/lnet/selftest/autoMakefile.am +++ b/lnet/selftest/autoMakefile.am @@ -20,4 +20,4 @@ endif # MODULES install-data-hook: $(install_data_hook) MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ selftest -DIST_SOURCES = $(lnet_selftest-objs:%.o=%.c) console.h conrpc.h rpc.h selftest.h timer.h +EXTRA_DIST = $(lnet_selftest-objs:%.o=%.c) console.h conrpc.h rpc.h selftest.h timer.h diff --git a/lustre/cmm/autoMakefile.am b/lustre/cmm/autoMakefile.am index 783a09c..e7355f8 100644 --- a/lustre/cmm/autoMakefile.am +++ b/lustre/cmm/autoMakefile.am @@ -39,4 +39,4 @@ modulefs_DATA = cmm$(KMODEXT) endif MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES = $(cmm-objs:%.o=%.c) cmm_internal.h mdc_internal.h +EXTRA_DIST = $(cmm-objs:%.o=%.c) cmm_internal.h mdc_internal.h diff --git a/lustre/fid/autoMakefile.am b/lustre/fid/autoMakefile.am index a2bda3d..cb079c4 100644 --- a/lustre/fid/autoMakefile.am +++ b/lustre/fid/autoMakefile.am @@ -48,4 +48,4 @@ endif install-data-hook: $(install_data_hook) MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES = $(fid-objs:%.o=%.c) fid_internal.h +EXTRA_DIST = $(fid-objs:%.o=%.c) fid_internal.h diff --git a/lustre/fld/autoMakefile.am b/lustre/fld/autoMakefile.am index 77c654f..aaadac6 100644 --- a/lustre/fld/autoMakefile.am +++ b/lustre/fld/autoMakefile.am @@ -46,4 +46,4 @@ modulefs_DATA = fld$(KMODEXT) endif MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES := $(fld-objs:%.o=%.c) fld_internal.h +EXTRA_DIST := $(fld-objs:%.o=%.c) fld_internal.h diff --git a/lustre/lmv/autoMakefile.am b/lustre/lmv/autoMakefile.am index ffe64b3..c1d63b1 100644 --- a/lustre/lmv/autoMakefile.am +++ b/lustre/lmv/autoMakefile.am @@ -45,5 +45,5 @@ if MODULES modulefs_DATA = lmv$(KMODEXT) endif # MODULES -DIST_SOURCES = $(lmv-objs:.o=.c) lmv_internal.h +EXTRA_DIST = $(lmv-objs:.o=.c) lmv_internal.h MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ diff --git a/lustre/mdd/autoMakefile.am b/lustre/mdd/autoMakefile.am index 7c939ed..6a1747f 100644 --- a/lustre/mdd/autoMakefile.am +++ b/lustre/mdd/autoMakefile.am @@ -39,4 +39,4 @@ modulefs_DATA = mdd$(KMODEXT) endif MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES := $(mdd-objs:%.o=%.c) mdd_internal.h +EXTRA_DIST := $(mdd-objs:%.o=%.c) mdd_internal.h diff --git a/lustre/mdt/autoMakefile.am b/lustre/mdt/autoMakefile.am index 7905f02..d05b2d6 100644 --- a/lustre/mdt/autoMakefile.am +++ b/lustre/mdt/autoMakefile.am @@ -39,4 +39,4 @@ modulefs_DATA = mdt$(KMODEXT) endif MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES := $(mdt-objs:%.o=%.c) mdt_internal.h +EXTRA_DIST := $(mdt-objs:%.o=%.c) mdt_internal.h diff --git a/lustre/osd-ldiskfs/autoMakefile.am b/lustre/osd-ldiskfs/autoMakefile.am index cc3643e..09186d1 100644 --- a/lustre/osd-ldiskfs/autoMakefile.am +++ b/lustre/osd-ldiskfs/autoMakefile.am @@ -39,5 +39,5 @@ modulefs_DATA = osd_ldiskfs$(KMODEXT) endif MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES := $(osd_ldiskfs-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h \ - osd_iam.h +EXTRA_DIST := $(osd_ldiskfs-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h \ + osd_iam.h diff --git a/lustre/ptlrpc/gss/autoMakefile.am b/lustre/ptlrpc/gss/autoMakefile.am index b81b652..8d959ba 100644 --- a/lustre/ptlrpc/gss/autoMakefile.am +++ b/lustre/ptlrpc/gss/autoMakefile.am @@ -41,5 +41,5 @@ if MODULES modulefs_DATA = ptlrpc_gss$(KMODEXT) endif # MODULES -DIST_SOURCES = *.c *.h +EXTRA_DIST = *.c *.h MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -- 1.8.3.1