b=3031

 - clean more files at clean time

diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
index 7c68d87..0d82a44 100644 (file)
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ b/ldiskfs/ldiskfs/autoMakefile.am
@@ -71,7 +71,7 @@ foo-check:
        @echo "ldiskfs_OBJECTS: $(ldiskfs_OBJECTS)"
        @echo "ldiskfs_LDADD: $(ldiskfs_LDADD)"
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = sources *.c *.h
 
 clean: clean-am

diff --git a/lustre/cmobd/autoMakefile.am b/lustre/cmobd/autoMakefile.am
index 59d6abb..7a8256b 100644 (file)
--- a/lustre/cmobd/autoMakefile.am
+++ b/lustre/cmobd/autoMakefile.am
@@ -7,5 +7,5 @@ if MODULES
 modulefs_DATA = cmobd$(KMODEXT)
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(cmobd-objs:%.o=%.c) cm_internal.h

diff --git a/lustre/cobd/autoMakefile.am b/lustre/cobd/autoMakefile.am
index ab8b4db..aa9ca4c 100644 (file)
--- a/lustre/cobd/autoMakefile.am
+++ b/lustre/cobd/autoMakefile.am
@@ -8,4 +8,4 @@ modulefs_DATA := cobd$(KMODEXT)
 endif
 
 DIST_SOURCES = $(cobd-objs:.o=.c)
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/ldiskfs/autoMakefile.am b/lustre/ldiskfs/autoMakefile.am
index 7c68d87..0d82a44 100644 (file)
--- a/lustre/ldiskfs/autoMakefile.am
+++ b/lustre/ldiskfs/autoMakefile.am
@@ -71,7 +71,7 @@ foo-check:
        @echo "ldiskfs_OBJECTS: $(ldiskfs_OBJECTS)"
        @echo "ldiskfs_LDADD: $(ldiskfs_LDADD)"
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = sources *.c *.h
 
 clean: clean-am

diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am
index 7643aef..4f05281 100644 (file)
--- a/lustre/ldlm/Makefile.am
+++ b/lustre/ldlm/Makefile.am
@@ -7,7 +7,7 @@
 # ldlm is built into ptlrpc
 #
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = 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 ldlm_test.c l_lock.c ldlm_inodebits.c

diff --git a/lustre/llite/autoMakefile.am b/lustre/llite/autoMakefile.am
index 0d3209c..74cc391 100644 (file)
--- a/lustre/llite/autoMakefile.am
+++ b/lustre/llite/autoMakefile.am
@@ -10,4 +10,4 @@ endif
 endif
 
 DIST_SOURCES := $(llite-objs:.o=.c) llite_internal.h rw24.c super.c rw26.c super25.c
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/lmv/autoMakefile.am b/lustre/lmv/autoMakefile.am
index e0bee99..5de6b65 100644 (file)
--- a/lustre/lmv/autoMakefile.am
+++ b/lustre/lmv/autoMakefile.am
@@ -15,4 +15,4 @@ modulefs_DATA = lmv$(KMODEXT)
 endif # MODULES
 
 DIST_SOURCES = $(lmv-objs:.o=.c) lmv_internal.h
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/autoMakefile.am
index e6854ec..30b89f6 100644 (file)
--- a/lustre/lov/autoMakefile.am
+++ b/lustre/lov/autoMakefile.am
@@ -15,4 +15,4 @@ modulefs_DATA = lov$(KMODEXT)
 endif # MODULES
 
 DIST_SOURCES = $(lov-objs:.o=.c) lov_internal.h
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
index 460e497..1a2154d 100644 (file)
--- a/lustre/lvfs/autoMakefile.am
+++ b/lustre/lvfs/autoMakefile.am
@@ -54,5 +54,5 @@ DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_smfs.c fsfilt_reiserfs.c \
        lvfs_common.c lvfs_internal.h lvfs_linux.c llog.c llog_cat.c \
        llog_lvfs.c lvfs_userfs.c fsfilt_snap_ext3.c
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 CLEANFILES = fsfilt-*.c fsfilt_ldiskfs.c fsfilt_extN.c sources

diff --git a/lustre/mdc/autoMakefile.am b/lustre/mdc/autoMakefile.am
index 57e7acb..6d474e4 100644 (file)
--- a/lustre/mdc/autoMakefile.am
+++ b/lustre/mdc/autoMakefile.am
@@ -17,4 +17,4 @@ endif
 endif
 
 DIST_SOURCES = $(mdc-objs:.o=.c) mdc_internal.h
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/mds/autoMakefile.am b/lustre/mds/autoMakefile.am
index b05a4b5..e50873a 100644 (file)
--- a/lustre/mds/autoMakefile.am
+++ b/lustre/mds/autoMakefile.am
@@ -7,5 +7,5 @@ if MODULES
 modulefs_DATA = mds$(KMODEXT)
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(mds-objs:%.o=%.c) mds_internal.h

diff --git a/lustre/mgmt/autoMakefile.am b/lustre/mgmt/autoMakefile.am
index 0966ec8..967ab3c 100644 (file)
--- a/lustre/mgmt/autoMakefile.am
+++ b/lustre/mgmt/autoMakefile.am
@@ -5,5 +5,5 @@
 
 modulefs_DATA = mgmt-svc$(KMODEXT) mgmt-cli$(KMODEXT)
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(mgmt-svc-objs:.o=.c) $(mgc-cli-objs:.o=.c)

diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
index 6b659d4..d4e3204 100644 (file)
--- a/lustre/obdclass/autoMakefile.am
+++ b/lustre/obdclass/autoMakefile.am
@@ -14,5 +14,5 @@ modulefs_DATA = obdclass$(KMODEXT) confobd$(KMODEXT)
 noinst_DATA = llog_test$(KMODEXT)
 endif # MODULES
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c llog-test.c 
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  llog-test.c 
 DIST_SOURCES = $(filter-out llog-test.c,$(obdclass-objs:.o=.c)) confobd.c llog_test.c

diff --git a/lustre/obdecho/autoMakefile.am b/lustre/obdecho/autoMakefile.am
index 24d8044..834b082 100644 (file)
--- a/lustre/obdecho/autoMakefile.am
+++ b/lustre/obdecho/autoMakefile.am
@@ -14,5 +14,5 @@ if MODULES
 modulefs_DATA = obdecho$(KMODEXT)
 endif # MODULES
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(obdecho-objs:%.o=%.c)

diff --git a/lustre/obdfilter/autoMakefile.am b/lustre/obdfilter/autoMakefile.am
index 09d52b2..5f90afb 100644 (file)
--- a/lustre/obdfilter/autoMakefile.am
+++ b/lustre/obdfilter/autoMakefile.am
@@ -7,5 +7,5 @@ if MODULES
 modulefs_DATA = obdfilter$(KMODEXT)
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(obdfilter-objs:%.o=%.c) filter_io_24.c filter_io_26.c filter_internal.h

diff --git a/lustre/osc/autoMakefile.am b/lustre/osc/autoMakefile.am
index dae803a..af0649d 100644 (file)
--- a/lustre/osc/autoMakefile.am
+++ b/lustre/osc/autoMakefile.am
@@ -14,5 +14,5 @@ if MODULES
 modulefs_DATA = osc$(KMODEXT)
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(osc-objs:%.o=%.c) osc_internal.h

diff --git a/lustre/ost/autoMakefile.am b/lustre/ost/autoMakefile.am
index 37e7583..95053d7 100644 (file)
--- a/lustre/ost/autoMakefile.am
+++ b/lustre/ost/autoMakefile.am
@@ -7,5 +7,5 @@ if MODULES
 modulefs_DATA = ost$(KMODEXT)
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(ost-objs:%.o=%.c)

diff --git a/lustre/ptlbd/autoMakefile.am b/lustre/ptlbd/autoMakefile.am
index 6b76199..fea28c4 100644 (file)
--- a/lustre/ptlbd/autoMakefile.am
+++ b/lustre/ptlbd/autoMakefile.am
@@ -9,5 +9,5 @@ modulefs_DATA = ptlbd$(KMODEXT)
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(ptlbd-objs:%.o=%.c)

diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/autoMakefile.am
index 16db713..4ab929f 100644 (file)
--- a/lustre/ptlrpc/autoMakefile.am
+++ b/lustre/ptlrpc/autoMakefile.am
@@ -32,5 +32,5 @@ if MODULES
 modulefs_DATA = ptlrpc$(KMODEXT)
 endif # MODULES
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c ldlm_*.c l_lock.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@  ldlm_*.c l_lock.c
 DIST_SOURCES = $(ptlrpc_objs:.o=.c) ptlrpc_internal.h

diff --git a/lustre/sec/autoMakefile.am b/lustre/sec/autoMakefile.am
index 7422341..c14dbfe 100644 (file)
--- a/lustre/sec/autoMakefile.am
+++ b/lustre/sec/autoMakefile.am
@@ -19,4 +19,4 @@ modulefs_DATA = ptlrpcs$(KMODEXT)
 endif
 
 DIST_SOURCES = $(ptlrpcs-objs:.o=.c)
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/sec/gss/autoMakefile.am b/lustre/sec/gss/autoMakefile.am
index f729d06..50a9226 100644 (file)
--- a/lustre/sec/gss/autoMakefile.am
+++ b/lustre/sec/gss/autoMakefile.am
@@ -20,4 +20,4 @@ endif
 
 DIST_SOURCES = $(ptlrpcs_gss-objs:.o=.c) gss_internal.h gss_api.h gss_asn1.h \
                gss_err.h gss_krb5.h
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 

diff --git a/lustre/smfs/autoMakefile.am b/lustre/smfs/autoMakefile.am
index f57fbfb..32d9c9a 100644 (file)
--- a/lustre/smfs/autoMakefile.am
+++ b/lustre/smfs/autoMakefile.am
@@ -9,5 +9,5 @@ modulefs_DATA = smfs$(KMODEXT)
 endif
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(smfs-objs:%.o=%.c) smfs_internal.h smfs_api.h

diff --git a/lustre/snapfs/autoMakefile.am b/lustre/snapfs/autoMakefile.am
index e5a57a9..30cf5d9 100644 (file)
--- a/lustre/snapfs/autoMakefile.am
+++ b/lustre/snapfs/autoMakefile.am
@@ -9,6 +9,6 @@ if SNAPFS
 modulefs_DATA = snapfs$(KMODEXT)
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 DIST_SOURCES = $(snapfs-objs:%.o=%.c) snapfs_internal.h snapfs_support.h