Branch b1_6

b=18056
i=adilger, tappro

Get rid of the warning messages during automake-1.9.

diff --git a/lnet/klnds/ciblnd/Makefile.in b/lnet/klnds/ciblnd/Makefile.in
index 55311ad..27a79d0 100644 (file)
--- a/lnet/klnds/ciblnd/Makefile.in
+++ b/lnet/klnds/ciblnd/Makefile.in
@@ -3,6 +3,7 @@ kciblnd-objs := ciblnd.o ciblnd_cb.o ciblnd_modparams.o
 
 default: all
 
+EXTRA_DIST = $(kciblnd-objs:%.o=%.c)
 EXTRA_POST_CFLAGS := @CIBCPPFLAGS@ -I@LUSTRE@/../lnet/klnds/openiblnd
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/ciblnd/autoMakefile.am b/lnet/klnds/ciblnd/autoMakefile.am
index adb8801..5990ada 100644 (file)
--- a/lnet/klnds/ciblnd/autoMakefile.am
+++ b/lnet/klnds/ciblnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kciblnd-objs:%.o=%.c)

diff --git a/lnet/klnds/gmlnd/Makefile.in b/lnet/klnds/gmlnd/Makefile.in
index 1aec50d..e933b59 100644 (file)
--- a/lnet/klnds/gmlnd/Makefile.in
+++ b/lnet/klnds/gmlnd/Makefile.in
@@ -1,6 +1,7 @@
 MODULES := kgmlnd
 kgmlnd-objs := gmlnd_api.o gmlnd_cb.o gmlnd_comm.o gmlnd_utils.o gmlnd_module.o
 
+EXTRA_DIST = $(kgmlnd-objs:%.o=%.c) gmlnd.h
 EXTRA_PRE_CFLAGS := @GMCPPFLAGS@ -DGM_KERNEL
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/gmlnd/autoMakefile.am b/lnet/klnds/gmlnd/autoMakefile.am
index 55ebc58..a6e7555 100644 (file)
--- a/lnet/klnds/gmlnd/autoMakefile.am
+++ b/lnet/klnds/gmlnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
-DIST_SOURCES = $(kgmlnd-objs:%.o=%.c) gmlnd.h

diff --git a/lnet/klnds/iiblnd/Makefile.in b/lnet/klnds/iiblnd/Makefile.in
index 7ee9b64..72c6e1d 100644 (file)
--- a/lnet/klnds/iiblnd/Makefile.in
+++ b/lnet/klnds/iiblnd/Makefile.in
@@ -1,6 +1,7 @@
 MODULES := kiiblnd
 kiiblnd-objs := iiblnd.o iiblnd_cb.o iiblnd_modparams.o
 
+EXTRA_DIST = $(kiiblnd-objs:%.o=%.c) iiblnd.h
 EXTRA_POST_CFLAGS := @IIBCPPFLAGS@
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/iiblnd/autoMakefile.am b/lnet/klnds/iiblnd/autoMakefile.am
index 6e6972f..1facfac 100644 (file)
--- a/lnet/klnds/iiblnd/autoMakefile.am
+++ b/lnet/klnds/iiblnd/autoMakefile.am
@@ -40,4 +40,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kiiblnd-objs:%.o=%.c) iiblnd.h

diff --git a/lnet/klnds/mxlnd/Makefile.in b/lnet/klnds/mxlnd/Makefile.in
index 378dbdd..7d175c9 100644 (file)
--- a/lnet/klnds/mxlnd/Makefile.in
+++ b/lnet/klnds/mxlnd/Makefile.in
@@ -1,6 +1,7 @@
 MODULES := kmxlnd
 kmxlnd-objs := mxlnd.o mxlnd_cb.o mxlnd_modparams.o
 
+EXTRA_DIST = $(kmxlnd-objs:%.o=%.c) mxlnd.h
 EXTRA_POST_CFLAGS := @MXCPPFLAGS@
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/mxlnd/autoMakefile.am b/lnet/klnds/mxlnd/autoMakefile.am
index f72374e..415333f 100644 (file)
--- a/lnet/klnds/mxlnd/autoMakefile.am
+++ b/lnet/klnds/mxlnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kmxlnd-objs:%.o=%.c) mxlnd.h mxlnd_wire.h

diff --git a/lnet/klnds/o2iblnd/Makefile.in b/lnet/klnds/o2iblnd/Makefile.in
index 569c266..0b74f0a 100644 (file)
--- a/lnet/klnds/o2iblnd/Makefile.in
+++ b/lnet/klnds/o2iblnd/Makefile.in
@@ -4,5 +4,6 @@ ko2iblnd-objs := o2iblnd.o o2iblnd_cb.o o2iblnd_modparams.o
 # Need to make sure we use PRE, not POST here so that an external OFED
 # source pool overrides any in-kernel OFED sources
 EXTRA_PRE_CFLAGS := @O2IBCPPFLAGS@
+EXTRA_DIST = $(ko2iblnd-objs:%.o=%.c) o2iblnd.h
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/o2iblnd/autoMakefile.am b/lnet/klnds/o2iblnd/autoMakefile.am
index 38773e3..29c55c7 100644 (file)
--- a/lnet/klnds/o2iblnd/autoMakefile.am
+++ b/lnet/klnds/o2iblnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(ko2iblnd-objs:%.o=%.c) o2iblnd.h

diff --git a/lnet/klnds/openiblnd/Makefile.in b/lnet/klnds/openiblnd/Makefile.in
index 86fa9cd..0b3dd38 100644 (file)
--- a/lnet/klnds/openiblnd/Makefile.in
+++ b/lnet/klnds/openiblnd/Makefile.in
@@ -1,6 +1,7 @@
 MODULES := kopeniblnd
 kopeniblnd-objs := openiblnd.o openiblnd_cb.o openiblnd_modparams.o
 
+EXTRA_DIST = $(kopeniblnd-objs:%.o=%.c) openiblnd.h
 EXTRA_POST_CFLAGS := @OPENIBCPPFLAGS@
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/openiblnd/autoMakefile.am b/lnet/klnds/openiblnd/autoMakefile.am
index ad5ceb4..a20f88b 100644 (file)
--- a/lnet/klnds/openiblnd/autoMakefile.am
+++ b/lnet/klnds/openiblnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kopeniblnd-objs:%.o=%.c) openiblnd.h

diff --git a/lnet/klnds/ptllnd/Makefile.in b/lnet/klnds/ptllnd/Makefile.in
index ec2f9bb..27a83ab 100755 (executable)
--- a/lnet/klnds/ptllnd/Makefile.in
+++ b/lnet/klnds/ptllnd/Makefile.in
@@ -1,6 +1,5 @@
 MODULES := kptllnd
 
-EXTRA_POST_CFLAGS := @PTLLNDCPPFLAGS@
 
 kptllnd-objs := ptllnd.o                \
                 ptllnd_cb.o             \
@@ -10,4 +9,7 @@ kptllnd-objs := ptllnd.o                \
                 ptllnd_tx.o            \
                 ptllnd_ptltrace.o
 
+EXTRA_DIST = $(kptllnd-objs:%.o=%.c) ptllnd.h
+EXTRA_POST_CFLAGS := @PTLLNDCPPFLAGS@
+
 @INCLUDE_RULES@

diff --git a/lnet/klnds/ptllnd/autoMakefile.am b/lnet/klnds/ptllnd/autoMakefile.am
index bd8cc9c..11aa155 100755 (executable)
--- a/lnet/klnds/ptllnd/autoMakefile.am
+++ b/lnet/klnds/ptllnd/autoMakefile.am
@@ -5,4 +5,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kptllnd-objs:%.o=%.c) ptllnd.h

diff --git a/lnet/klnds/qswlnd/Makefile.in b/lnet/klnds/qswlnd/Makefile.in
index b623e02..9ec7d2c 100644 (file)
--- a/lnet/klnds/qswlnd/Makefile.in
+++ b/lnet/klnds/qswlnd/Makefile.in
@@ -1,6 +1,7 @@
 MODULES := kqswlnd
 kqswlnd-objs := qswlnd.o qswlnd_cb.o qswlnd_modparams.o
 
+EXTRA_DIST = $(kqswlnd-objs:%.o=%.c) qswlnd.h
 EXTRA_POST_CFLAGS := @QSWCPPFLAGS@ -I/usr/include
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/qswlnd/autoMakefile.am b/lnet/klnds/qswlnd/autoMakefile.am
index 9fd14e6..bf892e8 100644 (file)
--- a/lnet/klnds/qswlnd/autoMakefile.am
+++ b/lnet/klnds/qswlnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kqswlnd-objs:%.o=%.c) qswlnd.h

diff --git a/lnet/klnds/ralnd/Makefile.in b/lnet/klnds/ralnd/Makefile.in
index e1f5e82..c9f38f3 100644 (file)
--- a/lnet/klnds/ralnd/Makefile.in
+++ b/lnet/klnds/ralnd/Makefile.in
@@ -1,6 +1,7 @@
 MODULES := kralnd
 kralnd-objs := ralnd.o ralnd_cb.o ralnd_modparams.o
 
+EXTRA_DIST = $(kralnd-objs:%.o=%.c) ralnd.h
 EXTRA_POST_CFLAGS := @RACPPFLAGS@
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/ralnd/autoMakefile.am b/lnet/klnds/ralnd/autoMakefile.am
index 2a67c9a..b755074 100644 (file)
--- a/lnet/klnds/ralnd/autoMakefile.am
+++ b/lnet/klnds/ralnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kralnd-objs:%.o=%.c) ralnd.h

diff --git a/lnet/klnds/socklnd/Makefile.in b/lnet/klnds/socklnd/Makefile.in
index 3a6c3f7..2187814 100644 (file)
--- a/lnet/klnds/socklnd/Makefile.in
+++ b/lnet/klnds/socklnd/Makefile.in
@@ -2,4 +2,6 @@ MODULES := ksocklnd
 
 ksocklnd-objs := socklnd.o socklnd_cb.o socklnd_modparams.o socklnd_lib-linux.o
 
+EXTRA_DIST := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
+
 @INCLUDE_RULES@

diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
index 0dbe697..a48ff8e 100644 (file)
--- a/lnet/klnds/socklnd/autoMakefile.am
+++ b/lnet/klnds/socklnd/autoMakefile.am
@@ -6,14 +6,11 @@ if LINUX
 endif # LINUX
 endif # MODULES
 
-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_modparams.c socklnd_lib-darwin.c
-  DIST_SOURCES += socklnd_lib-darwin.c socklnd_lib-darwin.h
 
   ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
   ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
@@ -22,9 +19,9 @@ if DARWIN
   plist_DATA := Info.plist
   install_data_hook := fix-kext-ownership
 
+  EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
 endif # DARWIN
 
-EXTRA_DIST := $(plist_DATA)
 install-data-hook: $(install_data_hook)
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ socklnd_lib.c

diff --git a/lnet/klnds/viblnd/Makefile.in b/lnet/klnds/viblnd/Makefile.in
index 5b5c2db..a9bedaa 100644 (file)
--- a/lnet/klnds/viblnd/Makefile.in
+++ b/lnet/klnds/viblnd/Makefile.in
@@ -1,6 +1,7 @@
 MODULES := kviblnd
 kviblnd-objs := viblnd.o viblnd_cb.o viblnd_modparams.o
 
+EXTRA_DIST = $(kviblnd-objs:%.o=%.c) viblnd.h viblnd_wire.h
 EXTRA_POST_CFLAGS := @VIBCPPFLAGS@
 
 @INCLUDE_RULES@

diff --git a/lnet/klnds/viblnd/autoMakefile.am b/lnet/klnds/viblnd/autoMakefile.am
index b27fc07..63a6d3d 100644 (file)
--- a/lnet/klnds/viblnd/autoMakefile.am
+++ b/lnet/klnds/viblnd/autoMakefile.am
@@ -41,4 +41,3 @@ endif
 endif
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@
-DIST_SOURCES = $(kviblnd-objs:%.o=%.c) viblnd.h viblnd_wire.h

diff --git a/lnet/libcfs/Makefile.in b/lnet/libcfs/Makefile.in
index 0940a56..eb2e674 100644 (file)
--- a/lnet/libcfs/Makefile.in
+++ b/lnet/libcfs/Makefile.in
@@ -28,6 +28,7 @@ libcfs-all-objs := debug.o nidstrings.o lwt.o module.o tracefile.o watchdog.o
 
 libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
 
+EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h user-prim.c user-lock.c Info.plist
 EXTRA_PRE_CFLAGS := -I@LUSTRE@/../lnet/libcfs
 
 @INCLUDE_RULES@

diff --git a/lnet/libcfs/autoMakefile.am b/lnet/libcfs/autoMakefile.am
index bd39583..7787e26 100644 (file)
--- a/lnet/libcfs/autoMakefile.am
+++ b/lnet/libcfs/autoMakefile.am
@@ -77,8 +77,4 @@ 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 user-prim.c \
-                                           user-lock.c user-tcpip.c user-bitops.c

diff --git a/lnet/lnet/Makefile.in b/lnet/lnet/Makefile.in
index 3bc86f6..5ee6084 100644 (file)
--- a/lnet/lnet/Makefile.in
+++ b/lnet/lnet/Makefile.in
@@ -7,4 +7,6 @@ lnet-objs += router.o router_proc.o acceptor.o peer.o
 
 default: all
 
+EXTRA_DIST = $(lnet-objs:%.o=%.c)
+
 @INCLUDE_RULES@

diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am
index 9ce40fe..57e4e65 100644 (file)
--- a/lnet/lnet/autoMakefile.am
+++ b/lnet/lnet/autoMakefile.am
@@ -43,4 +43,3 @@ install-data-hook: $(install_data_hook)
 EXTRA_DIST := Info.plist
 
 MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ lnet
-DIST_SOURCES = $(lnet-objs:%.o=%.c)

diff --git a/lnet/selftest/Makefile.in b/lnet/selftest/Makefile.in
index 8ebef75..3c9e96f 100644 (file)
--- a/lnet/selftest/Makefile.in
+++ b/lnet/selftest/Makefile.in
@@ -4,4 +4,6 @@ lnet_selftest-objs := console.o conrpc.o conctl.o framework.o timer.o rpc.o work
 
 default: all
 
+EXTRA_DIST = $(lnet_selftest-objs:%.o=%.c) console.h conrpc.h rpc.h selftest.h timer.h
+
 @INCLUDE_RULES@

diff --git a/lnet/selftest/autoMakefile.am b/lnet/selftest/autoMakefile.am
index 36af901..b9ad0ab 100644 (file)
--- a/lnet/selftest/autoMakefile.am
+++ b/lnet/selftest/autoMakefile.am
@@ -20,4 +20,3 @@ 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