---
 configure.ac                                                    |    2 -
 contrib/misc/Makefile.am                                        |    2 -
 doc/examples/Makefile.am                                        |    2 -
 hwloc/Makefile.am                                               |    6 ----
 tests/hwloc/Makefile.am                                         |    2 -
 tests/hwloc/linux/allowed/test-topology.sh.in                   |    5 ---
 tests/hwloc/linux/gather/test-gather-topology.sh.in             |    4 +-
 tests/hwloc/linux/test-topology.sh.in                           |    5 ---
 tests/hwloc/wrapper.sh.in                                       |    3 --
 tests/hwloc/x86+linux/test-topology.sh.in                       |    5 ---
 tests/hwloc/x86/test-topology.sh.in                             |    5 ---
 tests/hwloc/xml/test-topology.sh.in                             |    5 ---
 utils/hwloc/Makefile.am                                         |   14 ----------
 utils/hwloc/test-fake-plugin.sh.in                              |    7 +----
 utils/hwloc/test-hwloc-annotate.sh.in                           |    5 ---
 utils/hwloc/test-hwloc-calc.sh.in                               |    5 ---
 utils/hwloc/test-hwloc-compress-dir.sh.in                       |    5 ---
 utils/hwloc/test-hwloc-diffpatch.sh.in                          |    7 +----
 utils/hwloc/test-hwloc-distrib.sh.in                            |    5 ---
 utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh.in |    2 -
 utils/hwloc/test-hwloc-info.sh.in                               |    5 ---
 utils/lstopo/Makefile.am                                        |    5 ---
 utils/lstopo/test-lstopo-shmem.sh.in                            |    5 ---
 utils/lstopo/test-lstopo.sh.in                                  |    5 ---
 utils/netloc/draw/Makefile.am                                   |    3 --
 utils/netloc/infiniband/Makefile.am                             |    3 --
 utils/netloc/mpi/Makefile.am                                    |   11 -------
 utils/netloc/scotch/Makefile.am                                 |    5 ---
 28 files changed, 24 insertions(+), 114 deletions(-)

--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -11,7 +11,7 @@ AM_CFLAGS = $(HWLOC_CFLAGS)
 AM_CPPFLAGS = $(HWLOC_CPPFLAGS)
 AM_LDFLAGS = $(HWLOC_LDFLAGS)
 
-LDADD = $(HWLOC_top_builddir)/hwloc/libhwloc.la
+LDADD = -lhwloc
 DEPENDENCIES = $(LDADD)
 
 TESTS = hwloc-hello
--- a/utils/hwloc/test-hwloc-annotate.sh.in
+++ b/utils/hwloc/test-hwloc-annotate.sh.in
@@ -11,10 +11,7 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
-annotate="$builddir/hwloc-annotate"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+annotate="/usr/bin/hwloc-annotate"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/utils/hwloc/test-hwloc-calc.sh.in
+++ b/utils/hwloc/test-hwloc-calc.sh.in
@@ -13,13 +13,10 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
-calc="$builddir/hwloc-calc"
+calc="/usr/bin/hwloc-calc"
 xmldir="$HWLOC_top_srcdir/tests/hwloc/xml"
 linuxdir="$HWLOC_top_srcdir/tests/hwloc/linux"
 
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
-
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
 
--- a/utils/hwloc/test-hwloc-compress-dir.sh.in
+++ b/utils/hwloc/test-hwloc-compress-dir.sh.in
@@ -11,10 +11,7 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
-compress="$builddir/hwloc-compress-dir"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+compress="/usr/bin/hwloc-compress-dir"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/utils/hwloc/test-hwloc-diffpatch.sh.in
+++ b/utils/hwloc/test-hwloc-diffpatch.sh.in
@@ -11,11 +11,8 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
-diff="$builddir/hwloc-diff"
-patch="$builddir/hwloc-patch"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+diff="/usr/bin/hwloc-diff"
+patch="/usr/bin/hwloc-patch"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/utils/hwloc/test-hwloc-distrib.sh.in
+++ b/utils/hwloc/test-hwloc-distrib.sh.in
@@ -13,10 +13,7 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
-distrib="$builddir/hwloc-distrib"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+distrib="/usr/bin/hwloc-distrib"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/utils/hwloc/test-hwloc-info.sh.in
+++ b/utils/hwloc/test-hwloc-info.sh.in
@@ -13,11 +13,8 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
-info="$builddir/hwloc-info"
+info="/usr/bin/hwloc-info"
 linuxdir="$HWLOC_top_srcdir/tests/hwloc/linux"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/utils/hwloc/test-fake-plugin.sh.in
+++ b/utils/hwloc/test-fake-plugin.sh.in
@@ -10,11 +10,8 @@
 
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 builddir="$HWLOC_top_builddir"
-lstopo="$builddir/utils/lstopo/lstopo-no-graphics"
-hcalc="$builddir/utils/hwloc/hwloc-calc"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+lstopo="/usr/bin/lstopo-no-graphics"
+hcalc="/usr/bin/hwloc-calc"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/tests/hwloc/Makefile.am
+++ b/tests/hwloc/Makefile.am
@@ -117,7 +117,7 @@ else
 hwloc_lib = libhwloc_embedded.la
 endif
 
-LDADD += $(HWLOC_top_builddir)/hwloc/$(hwloc_lib)
+LDADD += -lhwloc
 
 linux_libnuma_CFLAGS = $(AM_CFLAGS) $(HWLOC_NUMA_CFLAGS)
 linux_libnuma_LDADD = $(LDADD) $(HWLOC_NUMA_LIBS)
--- a/tests/hwloc/x86+linux/test-topology.sh.in
+++ b/tests/hwloc/x86+linux/test-topology.sh.in
@@ -8,10 +8,7 @@
 
 HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
-lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+lstopo="/usr/bin/lstopo-no-graphics"
 
 HWLOC_DONT_ADD_VERSION_INFO=1
 export HWLOC_DONT_ADD_VERSION_INFO
--- a/tests/hwloc/xml/test-topology.sh.in
+++ b/tests/hwloc/xml/test-topology.sh.in
@@ -14,10 +14,7 @@
 
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 HWLOC_top_srcdir="@HWLOC_top_srcdir@"
-lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+lstopo="/usr/bin/lstopo-no-graphics"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/tests/hwloc/linux/allowed/test-topology.sh.in
+++ b/tests/hwloc/linux/allowed/test-topology.sh.in
@@ -14,10 +14,7 @@
 
 HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
-lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+lstopo="/usr/bin/lstopo-no-graphics"
 
 HWLOC_THISSYSTEM=1
 export HWLOC_THISSYSTEM
--- a/tests/hwloc/linux/gather/test-gather-topology.sh.in
+++ b/tests/hwloc/linux/gather/test-gather-topology.sh.in
@@ -9,8 +9,8 @@
 #
 
 HWLOC_top_builddir="@HWLOC_top_builddir@"
-lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics"
-gather="$HWLOC_top_builddir/utils/hwloc/hwloc-gather-topology"
+lstopo="/usr/bin/lstopo-no-graphics"
+gather="/usr/bin/hwloc-gather-topology"
 
 # make sure we use default numeric formats
 LANG=C
--- a/tests/hwloc/linux/test-topology.sh.in
+++ b/tests/hwloc/linux/test-topology.sh.in
@@ -14,10 +14,7 @@
 
 HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
-lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+lstopo="/usr/bin/lstopo-no-graphics"
 
 HWLOC_DONT_ADD_VERSION_INFO=1
 export HWLOC_DONT_ADD_VERSION_INFO
--- a/tests/hwloc/x86/test-topology.sh.in
+++ b/tests/hwloc/x86/test-topology.sh.in
@@ -8,10 +8,7 @@
 
 HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
-lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+lstopo="/usr/bin/lstopo-no-graphics"
 
 HWLOC_DONT_ADD_VERSION_INFO=1
 export HWLOC_DONT_ADD_VERSION_INFO
--- a/utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh.in
+++ b/utils/hwloc/test-hwloc-dump-hwdata/test-hwloc-dump-hwdata.sh.in
@@ -10,7 +10,7 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/hwloc"
 builddir="$HWLOC_top_builddir/utils/hwloc"
-hdhd="$builddir/hwloc-dump-hwdata"
+hdhd="/usr/sbin/hwloc-dump-hwdata"
 
 : ${TMPDIR=/tmp}
 {
--- a/utils/lstopo/test-lstopo-shmem.sh.in
+++ b/utils/lstopo/test-lstopo-shmem.sh.in
@@ -7,10 +7,7 @@
 
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 builddir="$HWLOC_top_builddir/utils/lstopo"
-ls="$builddir/lstopo-no-graphics"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+ls="/usr/bin/lstopo-no-graphics"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/utils/lstopo/test-lstopo.sh.in
+++ b/utils/lstopo/test-lstopo.sh.in
@@ -13,10 +13,7 @@ HWLOC_top_srcdir="@HWLOC_top_srcdir@"
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 srcdir="$HWLOC_top_srcdir/utils/lstopo"
 builddir="$HWLOC_top_builddir/utils/lstopo"
-ls="$builddir/lstopo-no-graphics"
-
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
+ls="/usr/bin/lstopo-no-graphics"
 
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
--- a/utils/hwloc/Makefile.am
+++ b/utils/hwloc/Makefile.am
@@ -10,7 +10,7 @@ AM_CFLAGS = $(HWLOC_CFLAGS)
 AM_CPPFLAGS = $(HWLOC_CPPFLAGS)
 AM_LDFLAGS = $(HWLOC_LDFLAGS)
 
-LDADD = $(HWLOC_top_builddir)/hwloc/libhwloc.la
+LDADD = -lhwloc
 
 EXTRA_DIST = \
         test-hwloc-annotate.input test-hwloc-annotate.output \
@@ -27,28 +27,16 @@ noinst_LTLIBRARIES = libutils_common.la
 libutils_common_la_SOURCES = common-ps.c
 libutils_common_la_LIBADD = $(LDADD)
 
-bin_PROGRAMS = \
-        hwloc-annotate \
-        hwloc-bind \
-        hwloc-calc \
-        hwloc-diff \
-        hwloc-distrib \
-        hwloc-info \
-        hwloc-patch
-
 # start tests here before recursing into subdirs
 SUBDIRS = .
 
 if !HWLOC_HAVE_WINDOWS
-bin_PROGRAMS += hwloc-ps
 endif
 if HWLOC_HAVE_X86_CPUID
-bin_PROGRAMS += hwloc-gather-cpuid
 endif HWLOC_HAVE_X86_CPUID
 
 if HWLOC_HAVE_LINUX
 if HWLOC_HAVE_X86
-sbin_PROGRAMS = hwloc-dump-hwdata
 SUBDIRS += test-hwloc-dump-hwdata
 endif HWLOC_HAVE_X86
 endif HWLOC_HAVE_LINUX
--- a/utils/lstopo/Makefile.am
+++ b/utils/lstopo/Makefile.am
@@ -15,9 +15,6 @@ AM_LDFLAGS = $(HWLOC_LDFLAGS)
 LDADD = $(HWLOC_top_builddir)/hwloc/libhwloc.la \
 	$(HWLOC_top_builddir)/utils/hwloc/libutils_common.la
 
-bin_PROGRAMS = \
-        lstopo-no-graphics
-
 EXTRA_DIST = \
         lstopo-android.c \
         test-lstopo.output
@@ -43,14 +40,12 @@ lstopo_SOURCES = $(lstopo_no_graphics_SO
 lstopo_CPPFLAGS = $(AM_CPPFLAGS)
 lstopo_LDADD = $(lstopo_no_graphics_LDADD)
 if HWLOC_HAVE_CAIRO
-bin_PROGRAMS += lstopo
 lstopo_SOURCES += lstopo-cairo.c
 lstopo_CPPFLAGS += -DLSTOPO_HAVE_GRAPHICS $(HWLOC_X11_CPPFLAGS)
 lstopo_CFLAGS = $(lstopo_no_graphics_CFLAGS) $(HWLOC_CAIRO_CFLAGS)
 lstopo_LDADD += $(HWLOC_CAIRO_LIBS) $(HWLOC_X11_LIBS)
 endif
 if HWLOC_HAVE_WINDOWS
-bin_PROGRAMS += lstopo lstopo-win
 lstopo_SOURCES += lstopo-windows.c
 lstopo_CPPFLAGS += -DLSTOPO_HAVE_GRAPHICS
 if HWLOC_HAVE_USER32
--- a/utils/netloc/draw/Makefile.am
+++ b/utils/netloc/draw/Makefile.am
@@ -12,9 +12,6 @@ AM_CPPFLAGS = \
         -I$(top_builddir)/include \
         -I$(top_srcdir)/include
 
-bin_PROGRAMS = \
-        netloc_draw_to_json
-
 netloc_draw_to_json_SOURCES = \
         netloc_draw_to_json.c
 
--- a/utils/netloc/infiniband/Makefile.am
+++ b/utils/netloc/infiniband/Makefile.am
@@ -19,9 +19,6 @@ AM_CPPFLAGS = \
         -I$(top_builddir)/include \
         -I$(top_srcdir)/include
 
-bin_PROGRAMS = \
-        netloc_ib_extract_dats
-
 netloc_ib_extract_dats_SOURCES = \
         netloc_ib_extract_dats.c
 
--- a/utils/netloc/mpi/Makefile.am
+++ b/utils/netloc/mpi/Makefile.am
@@ -13,17 +13,6 @@ AM_LDFLAGS = $(HWLOC_LDFLAGS)
 LDADD = $(top_builddir)/netloc/libnetloc.la \
 		$(top_builddir)/hwloc/libhwloc.la
 
-if BUILD_MPITOOLS
-bin_PROGRAMS = \
-        netloc_rank_order \
-        netloc_mpi_find_hosts
-
-if BUILD_NETLOCSCOTCH
-bin_PROGRAMS += \
-        netloc_mpi_rank_file
-endif
-endif
-
 netloc_rank_order_SOURCES = netloc_rank_order.c
 
 netloc_mpi_find_hosts_SOURCES = netloc_mpi_find_hosts.c
--- a/utils/netloc/scotch/Makefile.am
+++ b/utils/netloc/scotch/Makefile.am
@@ -15,10 +15,5 @@ LDADD = $(top_builddir)/netloc/libnetloc
         $(top_builddir)/hwloc/libhwloc.la \
         -lscotch -lscotcherr -lm -lpthread
 
-if BUILD_NETLOCSCOTCH
-bin_PROGRAMS = \
-        netlocscotch_get_arch
-endif
-
 netlocscotch_get_arch_SOURCES = \
         netlocscotch_get_arch.c
--- a/hwloc/Makefile.am
+++ b/hwloc/Makefile.am
@@ -13,12 +13,6 @@ EXTRA_DIST = dolib.c
 # If we're in standalone mode, build the installable library.
 # Otherwise, build the embedded library.
 
-if HWLOC_BUILD_STANDALONE
-lib_LTLIBRARIES = libhwloc.la
-else
-noinst_LTLIBRARIES = libhwloc_embedded.la
-endif
-
 pluginsdir = @HWLOC_PLUGINS_DIR@
 plugins_LTLIBRARIES =
 plugins_ldflags = -module -avoid-version $(HWLOC_DL_LIBS) $(HWLOC_LTDL_LIBS)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ EOF
 AC_CANONICAL_TARGET
 
 # Init automake
-AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects foreign tar-ustar parallel-tests -Wall -Werror])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects foreign tar-ustar parallel-tests -Wall])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_LANG([C])
--- a/contrib/misc/Makefile.am
+++ b/contrib/misc/Makefile.am
@@ -8,7 +8,7 @@ AM_CFLAGS = $(HWLOC_CFLAGS)
 AM_CPPFLAGS = $(HWLOC_CPPFLAGS)
 AM_LDFLAGS = $(HWLOC_LDFLAGS)
 
-LDADD = $(HWLOC_top_builddir)/hwloc/libhwloc.la
+LDADD = -lhwloc
 
 check_PROGRAMS = hwloc-tweak-osindex
 
--- a/tests/hwloc/wrapper.sh.in
+++ b/tests/hwloc/wrapper.sh.in
@@ -9,9 +9,6 @@
 HWLOC_top_builddir="@HWLOC_top_builddir@"
 xmlbuffer=xmlbuffer@EXEEXT@
 
-HWLOC_PLUGINS_PATH=${HWLOC_top_builddir}/hwloc/.libs
-export HWLOC_PLUGINS_PATH
-
 HWLOC_DEBUG_CHECK=1
 export HWLOC_DEBUG_CHECK
 
