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

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 9c17b56..c95f165 100644 (file)
--- 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 5ee4381..be0f4fb 100644 (file)
--- 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/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 7d4cd84..6011fb6 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -1810,16 +1810,10 @@ 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/libcfs/darwin/Makefile
 lnet/include/lnet/darwin/Makefile
 lnet/libcfs/darwin/Makefile
 ])
-               ;;
-esac
 ])
 
 #

diff --git a/lnet/include/libcfs/Makefile.am b/lnet/include/libcfs/Makefile.am
index 472d0ae..407b2d3 100644 (file)
--- a/lnet/include/libcfs/Makefile.am
+++ b/lnet/include/libcfs/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS := linux
 if DARWIN
 SUBDIRS += darwin
 endif
-DIST_SUBDIRS := $(SUBDIRS)
+DIST_SUBDIRS := linux darwin
 
 EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
        portals_utils.h types.h user-lock.h user-prim.h user-time.h \

diff --git a/lnet/include/lnet/Makefile.am b/lnet/include/lnet/Makefile.am
index c4f4929..9b60bbd 100644 (file)
--- 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/lnet/libcfs/autoMakefile.am b/lnet/libcfs/autoMakefile.am
index 7787e26..edd8c95 100644 (file)
--- a/lnet/libcfs/autoMakefile.am
+++ b/lnet/libcfs/autoMakefile.am
@@ -38,7 +38,7 @@ SUBDIRS := linux
 if DARWIN
 SUBDIRS += darwin
 endif
-DIST_SUBDIRS := $(SUBDIRS)
+DIST_SUBDIRS := linux darwin
 
 if LIBLUSTRE
 noinst_LIBRARIES= libcfs.a

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 54ec787..0338656 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2355,11 +2355,6 @@ lustre/scripts/Makefile
 lustre/tests/Makefile
 lustre/tests/mpi/Makefile
 lustre/utils/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 0553359..767446b 100644 (file)
--- 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