Makefile: don't have contrib/windows in both DIST_SUBDIRS and EXTRA_DIST

We used EXTRA_DIST of the entire directory to avoid listing all MSVC files,
and DIST_SUBDIRS for checking the version numbers in the windows config files.
Only use DIST_SUBDIRS (and list all files explicitly).

Signed-off-by: Brice Goglin <[email protected]>

Makefile.am

@@ -59,12 +59,6 @@ if HWLOC_BUILD_STANDALONE
 dist_pkgdata_DATA = contrib/hwloc-valgrind.supp
 endif
 
-# Only install entire visual studio subdirectory if we're building in
-# standalone mode
-if HWLOC_BUILD_STANDALONE
-EXTRA_DIST += contrib/windows
-endif
-
 if HWLOC_BUILD_STANDALONE
 dist-hook:
 	sh "$(top_srcdir)/config/distscript.sh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)"

contrib/windows/Makefile.am

@@ -1,7 +1,39 @@
-# Copyright © 2009-2018 Inria.  All rights reserved.
+# Copyright © 2009-2020 Inria.  All rights reserved.
 # See COPYING in top-level directory.
 
-# This Makefile doesn't run by default because it requires
-# bash, and grep built with support for -P
+# This Makefile isn't used outside of make dist by default
+# because test-windows-version.sh requires
+#  bash, and grep built with support for -P
 
 TESTS = test-windows-version.sh
+
+EXTRA_DIST = \
+	README \
+	hwloc.sln \
+	hwloc_config.h \
+	private_config.h \
+	static-components.h \
+	libhwloc.vcxproj \
+	libhwloc.vcxproj.filters \
+	hwloc-annotate.vcxproj \
+	hwloc-annotate.vcxproj.filters \
+	hwloc-bind.vcxproj \
+	hwloc-bind.vcxproj.filters \
+	hwloc-calc.vcxproj \
+	hwloc-calc.vcxproj.filters \
+	hwloc-diff.vcxproj \
+	hwloc-diff.vcxproj.filters \
+	hwloc-distrib.vcxproj \
+	hwloc-distrib.vcxproj.filters \
+	hwloc-gather-cpuid.vcxproj \
+	hwloc-gather-cpuid.vcxproj.filters \
+	hwloc-info.vcxproj \
+	hwloc-info.vcxproj.filters \
+	hwloc-patch.vcxproj \
+	hwloc-patch.vcxproj.filters \
+	lstopo-no-graphics.vcxproj \
+	lstopo-no-graphics.vcxproj.filters \
+	lstopo-win.vcxproj \
+	lstopo-win.vcxproj.filters \
+	lstopo.vcxproj \
+	lstopo.vcxproj.filters