Branch HEAD

b=18056
i=adilger, tappro

Fix warnings during automake-1.9.
Author: Jim Garlick(LLNL)

diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am
index 600c679..57897f2 100644 (file)
--- a/lustre/ldlm/Makefile.am
+++ b/lustre/ldlm/Makefile.am
@@ -39,7 +39,7 @@
 #
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES = ldlm_extent.c ldlm_flock.c ldlm_internal.h ldlm_lib.c \
+EXTRA_DIST = ldlm_extent.c ldlm_flock.c ldlm_internal.h ldlm_lib.c \
        ldlm_lock.c ldlm_lockd.c ldlm_plain.c ldlm_request.c         \
        ldlm_resource.c l_lock.c ldlm_inodebits.c ldlm_pool.c        \
        interval_tree.c

diff --git a/lustre/llite/Makefile.in b/lustre/llite/Makefile.in
index 848c26b..09689d2 100644 (file)
--- a/lustre/llite/Makefile.in
+++ b/lustre/llite/Makefile.in
@@ -8,4 +8,8 @@ lustre-objs += vvp_dev.o vvp_page.o vvp_lock.o vvp_io.o vvp_object.o
 
 llite_lloop-objs := lloop.o
 
+EXTRA_DIST := $(lustre-objs:.o=.c) llite_internal.h rw26.c super25.c
+EXTRA_DIST += $(llite_lloop-objs:.o=.c)
+EXTRA_DIST += vvp_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/llite/autoMakefile.am b/lustre/llite/autoMakefile.am
index d5d1c10..391a8f6 100644 (file)
--- a/lustre/llite/autoMakefile.am
+++ b/lustre/llite/autoMakefile.am
@@ -38,7 +38,4 @@ if MODULES
 modulefs_DATA = lustre$(KMODEXT) llite_lloop$(KMODEXT)
 endif
 
-DIST_SOURCES := $(lustre-objs:.o=.c) llite_internal.h rw26.c super25.c 
-DIST_SOURCES += $(llite_lloop-objs:.o=.c)
-DIST_SOURCES += vvp_internal.h
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/lov/Makefile.in b/lustre/lov/Makefile.in
index 5a2aad7..59f7c79 100644 (file)
--- a/lustre/lov/Makefile.in
+++ b/lustre/lov/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := lov
 lov-objs := lov_log.o lov_obd.o lov_pack.o lproc_lov.o lov_offset.o lov_merge.o lov_request.o lov_qos.o lov_ea.o lov_dev.o lov_object.o lov_page.o lov_lock.o lov_io.o lovsub_dev.o lovsub_object.o lovsub_page.o lovsub_lock.o lovsub_io.o lov_pool.o
 
+EXTRA_DIST = $(lov-objs:.o=.c) lov_internal.h lov_cl_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/autoMakefile.am
index e18070c..77c91b0 100644 (file)
--- a/lustre/lov/autoMakefile.am
+++ b/lustre/lov/autoMakefile.am
@@ -84,5 +84,4 @@ endif # MODULES
 
 install-data-hook: $(install_data_hook)
 
-DIST_SOURCES = $(lov-objs:.o=.c) lov_internal.h lov_cl_internal.h
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in
index 4b8773b..80687ea 100644 (file)
--- a/lustre/lvfs/Makefile.in
+++ b/lustre/lvfs/Makefile.in
@@ -12,6 +12,11 @@ fsfilt_@BACKINGFS@-objs := fsfilt-@BACKINGFS@.o
 $(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c
        ln -s $< $@
 
+EXTRA_DIST = $(lvfs-objs:.o=.c)  $(quotafmt-objs:.o=.c) \
+       fsfilt_ext3.c fsfilt_reiserfs.c \
+       lvfs_internal.h lvfs_userfs.c \
+       lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c
+
 # for <ext3/xattr.h> on 2.6
 EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
 

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index b80a28d..a7122cc 100644 (file)
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -101,10 +101,5 @@ endif # MODULES
 
 install-data-hook: $(install_data_hook)
 
-DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_reiserfs.c lvfs_common.c \
-       lvfs_internal.h lvfs_linux.c lvfs_userfs.c \
-       upcall_cache.c prng.c lvfs_lib.c \
-       lustre_quota_fmt.c lustre_quota_fmt.h quotafmt_test.c
-
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = fsfilt-*.c fsfilt_ldiskfs*.c fsfilt_extN.c sources

diff --git a/lustre/mdc/Makefile.in b/lustre/mdc/Makefile.in
index b9b9793..f007298 100644 (file)
--- a/lustre/mdc/Makefile.in
+++ b/lustre/mdc/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := mdc
 mdc-objs := mdc_request.o mdc_reint.o lproc_mdc.o mdc_lib.o mdc_locks.o
 
+EXTRA_DIST = $(mdc-objs:.o=.c) mdc_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/mdc/autoMakefile.am b/lustre/mdc/autoMakefile.am
index 65be657..ace974d 100644 (file)
--- a/lustre/mdc/autoMakefile.am
+++ b/lustre/mdc/autoMakefile.am
@@ -45,5 +45,4 @@ if MODULES
 modulefs_DATA = mdc$(KMODEXT)
 endif
 
-DIST_SOURCES = $(mdc-objs:.o=.c) mdc_internal.h
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/mds/Makefile.in b/lustre/mds/Makefile.in
index a6400b8..0bb2876 100644 (file)
--- a/lustre/mds/Makefile.in
+++ b/lustre/mds/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := mds
 mds-objs := handler.o  lproc_mds.o  mds_fs.o  mds_log.o  mds_lov.o
 
+EXTRA_DIST := $(mds-objs:%.o=%.c) mds_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/mds/autoMakefile.am b/lustre/mds/autoMakefile.am
index d2aafc6..4cc5dea 100644 (file)
--- a/lustre/mds/autoMakefile.am
+++ b/lustre/mds/autoMakefile.am
@@ -39,4 +39,3 @@ modulefs_DATA = mds$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES := $(mds-objs:%.o=%.c) mds_internal.h

diff --git a/lustre/mgc/Makefile.in b/lustre/mgc/Makefile.in
index 8adca32..7ce8a37 100644 (file)
--- a/lustre/mgc/Makefile.in
+++ b/lustre/mgc/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := mgc
 mgc-objs := mgc_request.o lproc_mgc.o
 
+EXTRA_DIST := $(mgc-objs:%.o=%.c) libmgc.c mgc_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/mgc/autoMakefile.am b/lustre/mgc/autoMakefile.am
index db9a433..e337ea9 100644 (file)
--- a/lustre/mgc/autoMakefile.am
+++ b/lustre/mgc/autoMakefile.am
@@ -46,4 +46,3 @@ modulefs_DATA = mgc$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES := $(mgc-objs:%.o=%.c) libmgc.c mgc_internal.h

diff --git a/lustre/mgs/Makefile.in b/lustre/mgs/Makefile.in
index 8bb6a5f..413f381 100644 (file)
--- a/lustre/mgs/Makefile.in
+++ b/lustre/mgs/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := mgs
 mgs-objs := mgs_handler.o mgs_fs.o mgs_llog.o lproc_mgs.o
 
+EXTRA_DIST := $(mgs-objs:%.o=%.c) mgs_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/mgs/autoMakefile.am b/lustre/mgs/autoMakefile.am
index c538cb4..a57c433 100644 (file)
--- a/lustre/mgs/autoMakefile.am
+++ b/lustre/mgs/autoMakefile.am
@@ -39,4 +39,3 @@ modulefs_DATA = mgs$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES := $(mgs-objs:%.o=%.c) mgs_internal.h

diff --git a/lustre/obdclass/Makefile.in b/lustre/obdclass/Makefile.in
index 90d898e..1ab1d54 100644 (file)
--- a/lustre/obdclass/Makefile.in
+++ b/lustre/obdclass/Makefile.in
@@ -26,4 +26,7 @@ llog_test-objs := llog-test.o
 $(obj)/llog-test.c: $(obj)/llog_test.c
        ln -sf $< $@
 
+EXTRA_DIST  = $(filter-out llog-test.c,$(obdclass-all-objs:.o=.c)) $(llog-test-objs:.o=.c) llog_test.c llog_internal.h
+EXTRA_DIST += cl_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
index b7fb43e..af30e10 100644 (file)
--- a/lustre/obdclass/autoMakefile.am
+++ b/lustre/obdclass/autoMakefile.am
@@ -54,4 +54,3 @@ install-data-hook: $(install_data_hook)
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  llog-test.c
 MOSTLYCLEANFILES += linux/*.o darwin/*.o
-DIST_SOURCES = $(filter-out llog-test.c,$(obdclass-all-objs:.o=.c)) $(llog-test-objs:.o=.c) llog_test.c llog_internal.h cl_internal.h

diff --git a/lustre/obdecho/Makefile.in b/lustre/obdecho/Makefile.in
index 66e61ed..c9069e5 100644 (file)
--- a/lustre/obdecho/Makefile.in
+++ b/lustre/obdecho/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := obdecho
 obdecho-objs := echo.o echo_client.o lproc_echo.o
 
+EXTRA_DIST = $(obdecho-objs:%.o=%.c) echo_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/obdecho/autoMakefile.am b/lustre/obdecho/autoMakefile.am
index c8b7df3..313b0f8 100644 (file)
--- a/lustre/obdecho/autoMakefile.am
+++ b/lustre/obdecho/autoMakefile.am
@@ -68,4 +68,3 @@ endif # MODULES
 install-data-hook: $(install_data_hook)
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES = $(obdecho-objs:%.o=%.c) echo_internal.h

diff --git a/lustre/obdfilter/Makefile.in b/lustre/obdfilter/Makefile.in
index 2a15c71..c1ebc18 100644 (file)
--- a/lustre/obdfilter/Makefile.in
+++ b/lustre/obdfilter/Makefile.in
@@ -4,4 +4,6 @@ obdfilter-objs := filter.o filter_io.o filter_log.o
 obdfilter-objs += lproc_obdfilter.o filter_lvb.o filter_capa.o
 obdfilter-objs += filter_io_26.o
 
+EXTRA_DIST = $(obdfilter-objs:%.o=%.c) filter_io_26.c filter_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/obdfilter/autoMakefile.am b/lustre/obdfilter/autoMakefile.am
index 89490fb..cfef4e9 100644 (file)
--- a/lustre/obdfilter/autoMakefile.am
+++ b/lustre/obdfilter/autoMakefile.am
@@ -39,4 +39,3 @@ modulefs_DATA = obdfilter$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES = $(obdfilter-objs:%.o=%.c) filter_io_26.c filter_internal.h

diff --git a/lustre/osc/Makefile.in b/lustre/osc/Makefile.in
index 438ce4c..40ffa16 100644 (file)
--- a/lustre/osc/Makefile.in
+++ b/lustre/osc/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := osc
 osc-objs := osc_request.o lproc_osc.o osc_create.o osc_dev.o osc_object.o osc_page.o osc_lock.o osc_io.o
 
+EXTRA_DIST = $(osc-objs:%.o=%.c) osc_internal.h osc_cl_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/osc/autoMakefile.am b/lustre/osc/autoMakefile.am
index cf370ba..59c37b2 100644 (file)
--- a/lustre/osc/autoMakefile.am
+++ b/lustre/osc/autoMakefile.am
@@ -75,4 +75,3 @@ endif
 install-data-hook: $(install_data_hook)
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES = $(osc-objs:%.o=%.c) osc_internal.h osc_cl_internal.h

diff --git a/lustre/ost/Makefile.in b/lustre/ost/Makefile.in
index 99002e4..6bd8be3 100644 (file)
--- a/lustre/ost/Makefile.in
+++ b/lustre/ost/Makefile.in
@@ -1,4 +1,6 @@
 MODULES := ost
 ost-objs := ost_handler.o lproc_ost.o
 
+EXTRA_DIST = $(ost-objs:%.o=%.c) ost_internal.h
+
 @INCLUDE_RULES@

diff --git a/lustre/ost/autoMakefile.am b/lustre/ost/autoMakefile.am
index 8db3fe4..907a0e0 100644 (file)
--- a/lustre/ost/autoMakefile.am
+++ b/lustre/ost/autoMakefile.am
@@ -39,4 +39,3 @@ modulefs_DATA = ost$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES = $(ost-objs:%.o=%.c) ost_internal.h

diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
index aee4786..3660c7f 100644 (file)
--- a/lustre/ptlrpc/Makefile.in
+++ b/lustre/ptlrpc/Makefile.in
@@ -30,6 +30,7 @@ l_lock.c: @LUSTRE@/ldlm/l_lock.c
 interval_tree.c: @LUSTRE@/ldlm/interval_tree.c
        ln -sf $< $@
 
+EXTRA_DIST = $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
 EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm
 
 @INCLUDE_RULES@

diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/autoMakefile.am
index c0d8c41..35577b5 100644 (file)
--- a/lustre/ptlrpc/autoMakefile.am
+++ b/lustre/ptlrpc/autoMakefile.am
@@ -117,5 +117,4 @@ SUBDIRS = gss
 endif
 
 install-data-hook: $(install_data_hook)
-DIST_SOURCES = $(ptlrpc_objs:.o=.c) ptlrpc_internal.h
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  ldlm_*.c l_lock.c interval_tree.c

diff --git a/lustre/quota/Makefile.in b/lustre/quota/Makefile.in
index f052b42..50efef3 100644 (file)
--- a/lustre/quota/Makefile.in
+++ b/lustre/quota/Makefile.in
@@ -3,5 +3,7 @@ MODULES := lquota
 lquota-objs := quota_check.o quota_context.o quota_ctl.o quota_interface.o
 lquota-objs += quota_master.o quota_adjust_qunit.o lproc_quota.o
 
+EXTRA_DIST := $(lquota-objs:%.o=%.c) $(quotactl-objs:%.o=%.c) $(quotacheck-objs:%.o=%.c) quota_internal.h
+
 @INCLUDE_RULES@
 

diff --git a/lustre/quota/autoMakefile.am b/lustre/quota/autoMakefile.am
index 9a20d28..0c9bd1f 100644 (file)
--- a/lustre/quota/autoMakefile.am
+++ b/lustre/quota/autoMakefile.am
@@ -46,4 +46,3 @@ modulefs_DATA = lquota$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES := $(lquota-objs:%.o=%.c) quota_internal.h