Merge pull request #590 from bgoglin/3.0-remove-netloc

remove netloc

Author: bgoglin

.gitignore

@@ -205,19 +205,6 @@ test-suite.log
 /utils/lstopo/test-*.sh.log
 /utils/lstopo/test-*.sh.trs
 
-/netloc.pc
-/netlocscotch.pc
-
-/utils/netloc/infiniband/netloc_ib_gather_raw
-/utils/netloc/infiniband/netloc_ib_extract_dats
-/utils/netloc/draw/netloc_draw_to_json
-/utils/netloc/mpi/netloc_mpi_find_hosts
-/utils/netloc/mpi/netloc_mpi_rank_file
-/utils/netloc/mpi/netloc_rank_order
-
-/tests/netloc/tests.sh
-/tests/netloc/data/scotch/scotch_get_arch
-
 /contrib/systemd/hwloc-dump-hwdata.service
 /contrib/misc/hwloc-tweak-osindex
 

Makefile.am

@@ -20,9 +20,6 @@ EXTRA_DIST = \
 SUBDIRS = include hwloc
 
 if HWLOC_BUILD_STANDALONE
-if BUILD_NETLOC
-SUBDIRS += netloc
-endif
 SUBDIRS += utils tests contrib/systemd contrib/completion contrib/misc contrib/hwloc-ps.www
 # We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
 # There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
@@ -35,24 +32,12 @@ DIST_SUBDIRS = $(SUBDIRS)
 if HWLOC_BUILD_STANDALONE
 DIST_SUBDIRS += contrib/windows
 EXTRA_DIST += contrib/windows-cmake
-if !BUILD_NETLOC
-DIST_SUBDIRS += netloc
-endif
 endif
 
 # Only install the pkg file if we're building in standalone mode (and not on Windows)
 if HWLOC_BUILD_STANDALONE
 hwlocpkgconfigdir = $(libdir)/pkgconfig
 hwlocpkgconfig_DATA = hwloc.pc
-if BUILD_NETLOC
-# JMS Need to compare hwloc.pc and netloc.pc -- I think netloc.pc is
-# missing some things.
-# pkgconfig_DATA += netloc.pc Disabled until the netloc API is public
-EXTRA_DIST += netloc.pc
-if BUILD_NETLOCSCOTCH
-hwlocpkgconfig_DATA += netlocscotch.pc
-endif BUILD_NETLOCSCOTCH
-endif BUILD_NETLOC
 endif HWLOC_BUILD_STANDALONE
 
 # Only install the valgrind suppressions file if we're building in
@@ -69,7 +54,6 @@ else !HWLOC_BUILD_STANDALONE
 dist-hook:
 	@MKDIR_P@	\
 		$(distdir)/doc \
-		$(distdir)/netloc \
 		$(distdir)/utils \
 		$(distdir)/tests \
 		$(distdir)/contrib/completion \

NEWS

@@ -36,6 +36,7 @@ Version 3.0.0
   + lstopo has a new --osf option to tune the displaying of object
     attributes and units.
 * Removed features
+  + Netloc.
   + Importing and exporting from/to hwloc 1.x XML.
   + BlueGene/Q support.
   + Functions that were deprecated since 2.0: