Open MPI logo

Hardware Locality Development Mailing List Archives

  |   Home   |   Support   |   FAQ   |   all Hardware Locality Development mailing list

Subject: Re: [hwloc-devel] [hwloc-svn] svn:hwloc r2730
From: Jeff Squyres (jsquyres_at_[hidden])
Date: 2010-11-05 12:39:51


If you do this, you must have a separate DIST_SUBDIRS.

This might still be problematic for running "make dist" on non-Linux platforms, though...

(I don't have time to look into this today)

On Nov 5, 2010, at 12:33 PM, sthibaul_at_[hidden] wrote:

> Author: sthibaul
> Date: 2010-11-05 12:33:59 EDT (Fri, 05 Nov 2010)
> New Revision: 2730
> URL: https://svn.open-mpi.org/trac/hwloc/changeset/2730
>
> Log:
> Add tests/linux to SUBDIRS only on Linux, to allow linux-specific commands there (like sed -i)
> Text files modified:
> trunk/tests/Makefile.am | 6 +++++-
> trunk/tests/linux/Makefile.am | 2 --
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> Modified: trunk/tests/Makefile.am
> ==============================================================================
> --- trunk/tests/Makefile.am (original)
> +++ trunk/tests/Makefile.am 2010-11-05 12:33:59 EDT (Fri, 05 Nov 2010)
> @@ -6,7 +6,11 @@
> AM_CPPFLAGS = $(HWLOC_CPPFLAGS)
> AM_LDFLAGS = $(HWLOC_LDFLAGS)
>
> -SUBDIRS = linux ports xml
> +SUBDIRS = ports xml
> +
> +if HWLOC_HAVE_LINUX
> +SUBDIRS += linux
> +endif
>
> LDADD =
>
>
> Modified: trunk/tests/linux/Makefile.am
> ==============================================================================
> --- trunk/tests/linux/Makefile.am (original)
> +++ trunk/tests/linux/Makefile.am 2010-11-05 12:33:59 EDT (Fri, 05 Nov 2010)
> @@ -101,13 +101,11 @@
> 16em64t-4s2c2t.xml.options
>
> if HWLOC_BUILD_TESTS
> -if HWLOC_HAVE_LINUX
> if HWLOC_HAVE_OPENAT
> if HWLOC_HAVE_BUNZIPP
> TESTS = $(sysfs_outputs)
> endif HWLOC_HAVE_BUNZIPP
> endif HWLOC_HAVE_OPENAT
> -endif HWLOC_HAVE_LINUX
> endif HWLOC_BUILD_TESTS
>
> EXTRA_DIST = $(sysfs_outputs) $(sysfs_tarballs) $(sysfs_excludes) $(sysfs_options)
> _______________________________________________
> hwloc-svn mailing list
> hwloc-svn_at_[hidden]
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-svn

-- 
Jeff Squyres
jsquyres_at_[hidden]
For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/