netloc: don't install pure-netloc things

netloc.pc and netloc*.h aren't needed since the netloc API isn't public yet.

But netloc.h is needed when netlocscotch API is enabled.

Makefile.am

@@ -40,7 +40,8 @@ pkgconfig_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
+# pkgconfig_DATA += netloc.pc Disabled until the netloc API is public
+EXTRA_DIST += netloc.pc
 if BUILD_NETLOCSCOTCH
 pkgconfig_DATA += netlocscotch.pc
 endif BUILD_NETLOCSCOTCH

include/Makefile.am

@@ -10,12 +10,8 @@
 if HWLOC_BUILD_STANDALONE
 include_HEADERS = hwloc.h
 
-if BUILD_NETLOC
-include_HEADERS += netloc.h
-endif
-
 if BUILD_NETLOCSCOTCH
-include_HEADERS += netlocscotch.h
+include_HEADERS += netloc.h netlocscotch.h
 endif
 
 include_hwlocdir = $(includedir)/hwloc
@@ -40,13 +36,6 @@ include_hwloc_HEADERS = \
 include_hwloc_autogendir = $(includedir)/hwloc/autogen
 nodist_include_hwloc_autogen_HEADERS = hwloc/autogen/config.h
 
-if BUILD_NETLOC
-include_netlocdir = $(includedir)/netloc
-include_netloc_HEADERS = \
-        netloc/utarray.h \
-        netloc/uthash.h
-endif
-
 noinst_HEADERS = \
         private/private.h \
         private/debug.h \
@@ -55,7 +44,9 @@ noinst_HEADERS = \
         private/components.h \
         private/cpuid-x86.h \
         private/netloc.h \
-        private/map.h
+        private/map.h \
+        netloc/utarray.h \
+        netloc/uthash.h
 
 if HWLOC_HAVE_LINUX
 include_hwloc_HEADERS += \