The hwloc library is used in the public API so we need hwloc.h in case hwloc is

enabled.

examples/Makefile.am

@@ -14,7 +14,8 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-LIBS = $(top_builddir)/src/libstarpu.la @LIBS@
+AM_CFLAGS = $(HWLOC_CFLAGS)
+LIBS = $(top_builddir)/src/libstarpu.la $(HWLOC_LIBS) @LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/examples/ -I$(top_builddir)/include
 
 TESTS	=	coverage/coverage.sh	\

libstarpu.pc.in

@@ -9,4 +9,5 @@ Version: @PACKAGE_VERSION@
 Cflags: -I${includedir} @STARPU_CUDA_CPPFLAGS@
 Libs: -L${libdir} -lstarpu @STARPU_CUDA_LDFLAGS@
 Libs.private: @LDFLAGS@ @LIBS@
-Requires.private: @HWLOC_REQUIRES@ @GORDON_REQUIRES@
+Requires: @HWLOC_REQUIRES@
+Requires.private: @GORDON_REQUIRES@

tests/Makefile.am

@@ -14,7 +14,8 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-LIBS = $(top_builddir)/src/libstarpu.la @LIBS@
+AM_CFLAGS = $(HWLOC_CFLAGS)
+LIBS = $(top_builddir)/src/libstarpu.la $(HWLOC_LIBS) @LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/include/
 
 EXTRA_DIST =					\

tools/Makefile.am

@@ -16,7 +16,8 @@
 
 SUBDIRS = 
 
-LIBS = $(top_builddir)/src/libstarpu.la @LIBS@
+AM_CFLAGS = $(HWLOC_CFLAGS)
+LIBS = $(top_builddir)/src/libstarpu.la $(HWLOC_LIBS) @LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_srcdir)/tools/ -I$(top_srcdir)/mpi/ -I$(top_builddir)/src -I$(top_srcdir)/src
 
 bin_PROGRAMS =