Revert "LU-455 Replace DIST_SOURCES with EXTRA_DIST"

This reverts commit bb60c75.
morrone · Jul 22, 2011 · 376d824 · 376d824
1 parent 62fa182
commit 376d824
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 29 deletions.
diff --git a/autoMakefile.am b/autoMakefile.am
@@ -2,6 +2,11 @@ SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_
 DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs lustre-iokit @LIBCFS_SUBDIR@ lnet lustre 
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
+if LDISKFS_ENABLED
+if !LDISKFS_IN_KERNEL
+EXTRA_SOURCES := @SYMVERFILE@
+endif
+endif
 
 @TESTS_TRUE@BUILD_TESTS = true
 @TESTS_FALSE@BUILD_TESTS = false
@@ -16,9 +21,6 @@ endif
 
 if LDISKFS_ENABLED
 if !LDISKFS_IN_KERNEL
-
-EXTRA_DIST += @SYMVERFILE@
-
 @SYMVERFILE@:
 	touch @SYMVERFILE@
 	-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
@@ -86,7 +86,9 @@ endif
 
 install-data-hook: $(install_data_hook)
 
+EXTRA_DIST := Info.plist
+
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o darwin/*.o libcfs
-EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) Info.plist tracefile.h prng.c \
+DIST_SOURCES := $(libcfs-all-objs:%.o=%.c) 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
@@ -1,7 +1,2 @@
-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_EXTRA = $(shell ls tests/*.[ch]) \
 	tests/Makefile.am tests/Makefile.in tests/module.mk
diff --git a/lnet/klnds/mxlnd/autoMakefile.am b/lnet/klnds/mxlnd/autoMakefile.am
@@ -41,4 +41,4 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-EXTRA_DIST = $(kmxlnd-objs:%.o=%.c) mxlnd.h
+DIST_SOURCES = $(kmxlnd-objs:%.o=%.c) mxlnd.h
diff --git a/lnet/klnds/o2iblnd/autoMakefile.am b/lnet/klnds/o2iblnd/autoMakefile.am
@@ -41,4 +41,4 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-EXTRA_DIST = $(ko2iblnd-objs:%.o=%.c) o2iblnd.h
+DIST_SOURCES = $(ko2iblnd-objs:%.o=%.c) o2iblnd.h
diff --git a/lnet/klnds/ptllnd/autoMakefile.am b/lnet/klnds/ptllnd/autoMakefile.am
@@ -5,4 +5,4 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-EXTRA_DIST = $(kptllnd-objs:%.o=%.c) ptllnd.h
+DIST_SOURCES = $(kptllnd-objs:%.o=%.c) ptllnd.h
diff --git a/lnet/klnds/qswlnd/autoMakefile.am b/lnet/klnds/qswlnd/autoMakefile.am
@@ -41,4 +41,4 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-EXTRA_DIST = $(kqswlnd-objs:%.o=%.c) qswlnd.h
+DIST_SOURCES = $(kqswlnd-objs:%.o=%.c) qswlnd.h
diff --git a/lnet/klnds/ralnd/autoMakefile.am b/lnet/klnds/ralnd/autoMakefile.am
@@ -41,4 +41,4 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-EXTRA_DIST = $(kralnd-objs:%.o=%.c) ralnd.h
+DIST_SOURCES = $(kralnd-objs:%.o=%.c) ralnd.h
diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
@@ -6,14 +6,14 @@ if LINUX
 endif # LINUX
 endif # MODULES
 
-EXTRA_DIST := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
+DIST_SOURCES := $(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
-  EXTRA_DIST += socklnd_lib-darwin.c socklnd_lib-darwin.h
+  DIST_SOURCES += 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
@@ -40,5 +40,7 @@ endif # MODULES
 
 install-data-hook: $(install_data_hook)
 
+EXTRA_DIST := Info.plist
+
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ lnet
-EXTRA_DIST = $(lnet-objs:%.o=%.c) Info.plist
+DIST_SOURCES = $(lnet-objs:%.o=%.c)
diff --git 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
-EXTRA_DIST = $(lnet_selftest-objs:%.o=%.c) console.h conrpc.h rpc.h selftest.h timer.h
+DIST_SOURCES = $(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
@@ -39,4 +39,4 @@ modulefs_DATA = cmm$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-EXTRA_DIST = $(cmm-objs:%.o=%.c) cmm_internal.h mdc_internal.h
+DIST_SOURCES = $(cmm-objs:%.o=%.c) cmm_internal.h mdc_internal.h
diff --git a/lustre/fid/autoMakefile.am b/lustre/fid/autoMakefile.am
@@ -48,4 +48,4 @@ endif
 install-data-hook: $(install_data_hook)
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-EXTRA_DIST = $(fid-objs:%.o=%.c) fid_internal.h
+DIST_SOURCES = $(fid-objs:%.o=%.c) fid_internal.h
diff --git a/lustre/fld/autoMakefile.am b/lustre/fld/autoMakefile.am
@@ -46,4 +46,4 @@ modulefs_DATA = fld$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-EXTRA_DIST := $(fld-objs:%.o=%.c) fld_internal.h
+DIST_SOURCES := $(fld-objs:%.o=%.c) fld_internal.h
diff --git a/lustre/lmv/autoMakefile.am b/lustre/lmv/autoMakefile.am
@@ -45,5 +45,5 @@ if MODULES
 modulefs_DATA = lmv$(KMODEXT)
 endif # MODULES
 
-EXTRA_DIST = $(lmv-objs:.o=.c) lmv_internal.h
+DIST_SOURCES = $(lmv-objs:.o=.c) lmv_internal.h
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
diff --git a/lustre/mdd/autoMakefile.am b/lustre/mdd/autoMakefile.am
@@ -39,4 +39,4 @@ modulefs_DATA = mdd$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-EXTRA_DIST := $(mdd-objs:%.o=%.c) mdd_internal.h
+DIST_SOURCES := $(mdd-objs:%.o=%.c) mdd_internal.h
diff --git a/lustre/mdt/autoMakefile.am b/lustre/mdt/autoMakefile.am
@@ -39,4 +39,4 @@ modulefs_DATA = mdt$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-EXTRA_DIST := $(mdt-objs:%.o=%.c) mdt_internal.h
+DIST_SOURCES := $(mdt-objs:%.o=%.c) mdt_internal.h
diff --git a/lustre/osd-ldiskfs/autoMakefile.am b/lustre/osd-ldiskfs/autoMakefile.am
@@ -39,5 +39,5 @@ modulefs_DATA = osd_ldiskfs$(KMODEXT)
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
-EXTRA_DIST := $(osd_ldiskfs-objs:%.o=%.c) osd_internal.h osd_oi.h osd_igif.h \
-              osd_iam.h
+DIST_SOURCES := $(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
@@ -41,5 +41,5 @@ if MODULES
 modulefs_DATA = ptlrpc_gss$(KMODEXT)
 endif # MODULES
 
-EXTRA_DIST = *.c *.h
+DIST_SOURCES = *.c *.h
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@