From 32f8814b83f8a2a1731e446b3e5a947236acafb0 Mon Sep 17 00:00:00 2001 From: yangsheng Date: Sun, 28 Dec 2008 15:46:31 +0000 Subject: [PATCH] Branch b1_6 b=18056 i=adilger, tappro Get rid of the warning messages during automake-1.9. --- lustre/ldlm/Makefile.am | 2 +- lustre/llite/Makefile.in | 3 +++ lustre/llite/autoMakefile.am | 2 -- lustre/lov/Makefile.in | 2 ++ lustre/lov/autoMakefile.am | 1 - lustre/lvfs/Makefile.in | 5 +++++ lustre/lvfs/autoMakefile.am | 7 ------- lustre/mdc/Makefile.in | 2 ++ lustre/mdc/autoMakefile.am | 1 - lustre/mds/Makefile.in | 2 ++ lustre/mds/autoMakefile.am | 1 - lustre/mgc/Makefile.in | 2 ++ lustre/mgc/autoMakefile.am | 1 - lustre/mgs/Makefile.in | 2 ++ lustre/mgs/autoMakefile.am | 1 - lustre/obdclass/Makefile.in | 2 ++ lustre/obdclass/autoMakefile.am | 1 - lustre/obdecho/Makefile.in | 2 ++ lustre/obdecho/autoMakefile.am | 1 - lustre/obdfilter/Makefile.in | 2 ++ lustre/obdfilter/autoMakefile.am | 1 - lustre/osc/Makefile.in | 2 ++ lustre/osc/autoMakefile.am | 1 - lustre/ost/Makefile.in | 2 ++ lustre/ost/autoMakefile.am | 1 - lustre/ptlrpc/Makefile.in | 1 + lustre/ptlrpc/autoMakefile.am | 1 - lustre/quota/Makefile.in | 2 ++ lustre/quota/autoMakefile.am | 1 - 29 files changed, 32 insertions(+), 22 deletions(-) diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am index 600c6792..57897f2 100644 --- 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 b5ed7be..723a97e 100644 --- a/lustre/llite/Makefile.in +++ b/lustre/llite/Makefile.in @@ -5,4 +5,7 @@ llite_lloop-objs := lloop.o lustre-objs += rw26.o super25.o +EXTRA_DIST := $(lustre-objs:.o=.c) llite_internal.h rw24.c super.c rw26.c super25.c +EXTRA_DIST += $(llite_lloop-objs:.o=.c) + @INCLUDE_RULES@ diff --git a/lustre/llite/autoMakefile.am b/lustre/llite/autoMakefile.am index 5dcc0cd..391a8f6 100644 --- a/lustre/llite/autoMakefile.am +++ b/lustre/llite/autoMakefile.am @@ -38,6 +38,4 @@ if MODULES modulefs_DATA = lustre$(KMODEXT) llite_lloop$(KMODEXT) endif -DIST_SOURCES := $(lustre-objs:.o=.c) llite_internal.h rw24.c super.c rw26.c super25.c -DIST_SOURCES += $(llite_lloop-objs:.o=.c) MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ diff --git a/lustre/lov/Makefile.in b/lustre/lov/Makefile.in index f714192..537c590 100644 --- 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 +EXTRA_DIST = $(lov-objs:.o=.c) lov_internal.h + @INCLUDE_RULES@ diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/autoMakefile.am index 8c3af02..81de3cc 100644 --- a/lustre/lov/autoMakefile.am +++ b/lustre/lov/autoMakefile.am @@ -73,5 +73,4 @@ endif # MODULES install-data-hook: $(install_data_hook) -DIST_SOURCES = $(lov-objs:.o=.c) lov_internal.h MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in index de72dbd..6bf31d8 100644 --- a/lustre/lvfs/Makefile.in +++ b/lustre/lvfs/Makefile.in @@ -14,6 +14,11 @@ $(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c ln -s $< $@ endif +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 + # for 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 37ab888..dc72cfb 100644 --- a/lustre/lvfs/autoMakefile.am +++ b/lustre/lvfs/autoMakefile.am @@ -104,12 +104,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 \ - lustre_quota_fmt_convert.c \ - # quotacheck_test.c quotactl_test.c fsfilt_ext3_quota.h - 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 --- 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 --- 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 96d7ec7..adbd619 100644 --- a/lustre/mds/Makefile.in +++ b/lustre/mds/Makefile.in @@ -2,4 +2,6 @@ MODULES := mds mds-objs := mds_log.o mds_unlink_open.o mds_lov.o handler.o mds_reint.o mds-objs += mds_fs.o lproc_mds.o mds_open.o mds_lib.o mds_xattr.o mds_join.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 --- 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 --- 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 --- 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 --- 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 --- 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 d81ee84..cc43100 100644 --- a/lustre/obdclass/Makefile.in +++ b/lustre/obdclass/Makefile.in @@ -34,4 +34,6 @@ $(obj)/llog-test.c: $(obj)/llog_test.c ln -sf $< $@ endif +EXTRA_DIST = $(filter-out llog-test.c,$(obdclass-all-objs:.o=.c)) $(llog-test-objs:.o=.c) llog_test.c llog_internal.h + @INCLUDE_RULES@ diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am index 40d964c..0553359 100644 --- a/lustre/obdclass/autoMakefile.am +++ b/lustre/obdclass/autoMakefile.am @@ -51,4 +51,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 diff --git a/lustre/obdecho/Makefile.in b/lustre/obdecho/Makefile.in index 66e61ed..73595ad 100644 --- 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) + @INCLUDE_RULES@ diff --git a/lustre/obdecho/autoMakefile.am b/lustre/obdecho/autoMakefile.am index bd83a99..313b0f8 100644 --- 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) diff --git a/lustre/obdfilter/Makefile.in b/lustre/obdfilter/Makefile.in index 8305eb5..2b4756c 100644 --- a/lustre/obdfilter/Makefile.in +++ b/lustre/obdfilter/Makefile.in @@ -9,4 +9,6 @@ else obdfilter-objs += filter_io_26.o endif # PATCHLEVEL +EXTRA_DIST = $(obdfilter-objs:%.o=%.c) filter_io_24.c filter_io_26.c filter_internal.h + @INCLUDE_RULES@ diff --git a/lustre/obdfilter/autoMakefile.am b/lustre/obdfilter/autoMakefile.am index 9eb4a37..cfef4e9 100644 --- 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_24.c filter_io_26.c filter_internal.h diff --git a/lustre/osc/Makefile.in b/lustre/osc/Makefile.in index 2eb2eea..4618145 100644 --- 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 cache.o +EXTRA_DIST = $(osc-objs:%.o=%.c) osc_internal.h + @INCLUDE_RULES@ diff --git a/lustre/osc/autoMakefile.am b/lustre/osc/autoMakefile.am index 65c588b..b99a9bf 100644 --- a/lustre/osc/autoMakefile.am +++ b/lustre/osc/autoMakefile.am @@ -69,4 +69,3 @@ endif install-data-hook: $(install_data_hook) MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ -DIST_SOURCES = $(osc-objs:%.o=%.c) osc_internal.h diff --git a/lustre/ost/Makefile.in b/lustre/ost/Makefile.in index 99002e4..6bd8be3 100644 --- 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 --- 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 535acac..0c42f15 100644 --- a/lustre/ptlrpc/Makefile.in +++ b/lustre/ptlrpc/Makefile.in @@ -29,6 +29,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 d345492..ccb79c3 100644 --- a/lustre/ptlrpc/autoMakefile.am +++ b/lustre/ptlrpc/autoMakefile.am @@ -105,5 +105,4 @@ endif # DARWIN endif # MODULES 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 --- 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 --- 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 -- 1.8.3.1