You can just assign constants to DIST_SUBDIRS; don't assign to it conditionally.
It should be set to: DIST_SUBDIRS = ports xml linux Meaning: we always distribute these dirs. If DIST_SUBDIRS is set, it trumps SUBDIRS during "make dist". Hence, it needs to be a complete listing of all the subdirs. On Nov 5, 2010, at 12:53 PM, sthib...@osl.iu.edu wrote: > Author: sthibaul > Date: 2010-11-05 12:53:08 EDT (Fri, 05 Nov 2010) > New Revision: 2734 > URL: https://svn.open-mpi.org/trac/hwloc/changeset/2734 > > Log: > keep linux in DIST_SUBDIRS for make dist on non-Linux platforms. > Text files modified: > trunk/README | 31 +++++++++++++++++++++++++++---- > trunk/tests/Makefile.am | 5 ++++- > 2 files changed, 31 insertions(+), 5 deletions(-) > > Modified: trunk/README > ============================================================================== > --- trunk/README (original) > +++ trunk/README 2010-11-05 12:53:08 EDT (Fri, 05 Nov 2010) > @@ -426,7 +426,8 @@ > > /* Example hwloc API program. > * > - * Copyright ? 2009 INRIA, Universit? Bordeaux 1 > + * Copyright ? 2009-2010 INRIA > + * Copyright ? 2009-2010 Universit? Bordeaux 1 > * Copyright ? 2009-2010 Cisco Systems, Inc. All rights reserved. > * > * hwloc-hello.c > @@ -453,13 +454,13 @@ > int main(void) > { > int depth; > - unsigned i; > + unsigned i, n; > unsigned long size; > int levels; > char string[128]; > int topodepth; > hwloc_topology_t topology; > - hwloc_bitmap_t cpuset; > + hwloc_cpuset_t cpuset; > hwloc_obj_t obj; > > /* Allocate and initialize topology object. */ > @@ -564,6 +565,28 @@ > hwloc_bitmap_free(cpuset); > } > > + /***************************************************************** > + * Sixth example: > + * Allocate some memory on the last NUMA node, bind some existing > + * memory to the last NUMA node. > + *****************************************************************/ > + /* Get last node. */ > + n = hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_NODE); > + if (n) { > + void *m; > + size_t size = 1024*1024; > + > + obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_NODE, n - 1); > + m = hwloc_alloc_membind_nodeset(topology, size, obj->nodeset, > + HWLOC_MEMBIND_DEFAULT, 0); > + hwloc_free_membind(topology, m, size); > + > + m = malloc(size); > + hwloc_set_area_membind_nodeset(topology, m, size, obj->nodeset, > + HWLOC_MEMBIND_DEFAULT, 0); > + free(m); > + } > + > /* Destroy topology object. */ > hwloc_topology_destroy(topology); > > @@ -647,5 +670,5 @@ > > ------------------------------------------------------------------------------- > > -Generated on Thu Oct 21 2010 17:46:01 for Hardware Locality (hwloc) by > doxygen > +Generated on Fri Nov 5 2010 17:52:24 for Hardware Locality (hwloc) by > doxygen > 1.7.1 > > Modified: trunk/tests/Makefile.am > ============================================================================== > --- trunk/tests/Makefile.am (original) > +++ trunk/tests/Makefile.am 2010-11-05 12:53:08 EDT (Fri, 05 Nov 2010) > @@ -7,10 +7,13 @@ > AM_LDFLAGS = $(HWLOC_LDFLAGS) > > SUBDIRS = ports xml > +DIST_SUBDIRS = > > if HWLOC_HAVE_LINUX > SUBDIRS += linux > -endif > +else !HWLOC_HAVE_LINUX > +DIST_SUBDIRS += linux > +endif !HWLOC_HAVE_LINUX > > LDADD = > > _______________________________________________ > hwloc-svn mailing list > hwloc-...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-svn -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
