From 5b2689070a899212477c374a713390cdf3eb7f3e Mon Sep 17 00:00:00 2001
From: "Brian J. Murrell" <brian@sun.com>
Date: Tue, 2 Mar 2010 17:32:48 -0800
Subject: [PATCH] b=21380 make dist seems to exclude the "darwin" bits

Include all of the darwin bits in the distribution tarball created with
make dist.

i=adilger
i=rread
---
 build/autoMakefile.am.toplevel           | 1 +
 build/autoconf/Makefile.am               | 5 +----
 libcfs/autoconf/lustre-libcfs.m4         | 6 ------
 libcfs/include/libcfs/Makefile.am        | 2 +-
 libcfs/include/libcfs/darwin/Makefile.am | 2 +-
 libcfs/libcfs/autoMakefile.am            | 2 +-
 lnet/autoconf/lustre-lnet.m4             | 6 ------
 lnet/include/lnet/Makefile.am            | 2 +-
 lustre/autoconf/lustre-core.m4           | 7 +------
 lustre/obdclass/autoMakefile.am          | 2 +-
 10 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 9c17b56..c95f165 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -104,6 +104,7 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
 	build/sles8-update_INITRD_MODULES.sh				\
 	build/sles8-update_rcfile_setting.sh build/update_oldconfig	\
 	build/autoconf/lustre-build-linux.m4				\
+	build/autoconf/lustre-build-darwin.m4				\
 	build/autoconf/lustre-build.m4 build/rdac_spec                  \
 	build/mptlinux.spec.patch build/patches
 
diff --git a/build/autoconf/Makefile.am b/build/autoconf/Makefile.am
index 5ee43813..be0f4fb 100644
--- a/build/autoconf/Makefile.am
+++ b/build/autoconf/Makefile.am
@@ -1,4 +1 @@
-EXTRA_DIST := lustre-build.m4 lustre-build-linux.m4
-if DARWIN
-EXTRA_DIST += lustre-build-darwin.m4
-endif
+EXTRA_DIST := lustre-build.m4 lustre-build-linux.m4 lustre-build-darwin.m4
diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 5d063ed..c908fc3 100644
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -920,13 +920,7 @@ libcfs/libcfs/linux/Makefile
 libcfs/libcfs/ulinux/Makefile
 libcfs/libcfs/posix/Makefile
 libcfs/libcfs/util/Makefile
-])
-case $lb_target_os in
-	darwin)
-		AC_CONFIG_FILES([
 libcfs/include/libcfs/darwin/Makefile
 libcfs/libcfs/darwin/Makefile
 ])
-		;;
-esac
 ])
diff --git a/libcfs/include/libcfs/Makefile.am b/libcfs/include/libcfs/Makefile.am
index b8e5907..faf9c72 100644
--- a/libcfs/include/libcfs/Makefile.am
+++ b/libcfs/include/libcfs/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS := linux posix util
 if DARWIN
 SUBDIRS += darwin
 endif
-DIST_SUBDIRS := $(SUBDIRS)
+DIST_SUBDIRS := linux posix util darwin
 
 EXTRA_DIST := curproc.h libcfs_private.h libcfs.h list.h lltrace.h \
 		user-lock.h user-prim.h user-time.h user-mem.h \
diff --git a/libcfs/include/libcfs/darwin/Makefile.am b/libcfs/include/libcfs/darwin/Makefile.am
index b37750e..ead910d 100644
--- a/libcfs/include/libcfs/darwin/Makefile.am
+++ b/libcfs/include/libcfs/darwin/Makefile.am
@@ -1,3 +1,3 @@
-EXTRA_DIST := darwin-mem.h darwin-types.h libcfs.                       \
+EXTRA_DIST := darwin-mem.h darwin-types.h libcfs.h                      \
 	darwin-fs.h darwin-prim.h darwin-utils.h lltrace.h		\
 	darwin-lock.h darwin-sync.h darwin-tcpip.h kp30.h
diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 42d7b58..b70e72e 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -38,7 +38,7 @@ SUBDIRS := linux util posix ulinux
 if DARWIN
 SUBDIRS += darwin
 endif
-DIST_SUBDIRS := $(SUBDIRS)
+DIST_SUBDIRS := linux util posix ulinux darwin
 
 if LIBLUSTRE
 noinst_LIBRARIES= libcfs.a
diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 15c98af..427c153 100644
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -1128,12 +1128,6 @@ lnet/ulnds/autoMakefile
 lnet/ulnds/socklnd/Makefile
 lnet/ulnds/ptllnd/Makefile
 lnet/utils/Makefile
-])
-case $lb_target_os in
-	darwin)
-		AC_CONFIG_FILES([
 lnet/include/lnet/darwin/Makefile
 ])
-		;;
-esac
 ])
diff --git a/lnet/include/lnet/Makefile.am b/lnet/include/lnet/Makefile.am
index c4f4929..9b60bbd 100644
--- a/lnet/include/lnet/Makefile.am
+++ b/lnet/include/lnet/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS := linux
 if DARWIN
 SUBDIRS += darwin
 endif
-DIST_SUBDIRS := $(SUBDIRS)
+DIST_SUBDIRS := linux darwin
 
 EXTRA_DIST = api.h api-support.h \
 	lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index bc1af26..277c22b 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2549,11 +2549,6 @@ lustre/tests/Makefile
 lustre/tests/mpi/Makefile
 lustre/utils/Makefile
 lustre/utils/gss/Makefile
+lustre/obdclass/darwin/Makefile
 ])
-case $lb_target_os in
-        darwin)
-                AC_CONFIG_FILES([ lustre/obdclass/darwin/Makefile ])
-                ;;
-esac
-
 ])
diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
index df8d06d..fc64935 100644
--- a/lustre/obdclass/autoMakefile.am
+++ b/lustre/obdclass/autoMakefile.am
@@ -2,7 +2,7 @@ SUBDIRS := linux
 if DARWIN
 SUBDIRS += darwin
 endif
-DIST_SUBDIRS := $(SUBDIRS)
+DIST_SUBDIRS := linux darwin
 
 if LIBLUSTRE
 
-- 
1.8.3.1