From 72e44cfefea5b7a580c7478b147105062d1fbb8e Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 17 Feb 2012 14:27:27 +0000 Subject: [PATCH] Fixes trac:2951: make .../hwloc/include/autogen/config.h not be included in the tarball. Thanks to Paul Hargrove for the fix. This commit was SVN r25952. The following Trac tickets were found above: Ticket 2951 --> https://svn.open-mpi.org/trac/ompi/ticket/2951 --- opal/mca/hwloc/hwloc132/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opal/mca/hwloc/hwloc132/Makefile.am b/opal/mca/hwloc/hwloc132/Makefile.am index 607137b639..851b91052f 100644 --- a/opal/mca/hwloc/hwloc132/Makefile.am +++ b/opal/mca/hwloc/hwloc132/Makefile.am @@ -23,6 +23,7 @@ sources = hwloc132_component.c # We only ever build this component statically noinst_LTLIBRARIES = libmca_hwloc_hwloc132.la libmca_hwloc_hwloc132_la_SOURCES = $(headers) $(sources) +nodist_libmca_hwloc_hwloc132_la_SOURCES = $(nodist_headers) libmca_hwloc_hwloc132_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc132_LDFLAGS) libmca_hwloc_hwloc132_la_LIBADD = $(opal_hwloc_hwloc132_LIBS) libmca_hwloc_hwloc132_la_DEPENDENCIES = \ @@ -43,11 +44,11 @@ headers += \ hwloc/include/hwloc/cuda.h \ hwloc/include/hwloc/cudart.h \ hwloc/include/hwloc/rename.h \ - hwloc/include/hwloc/autogen/config.h \ hwloc/include/private/private.h \ hwloc/include/private/debug.h \ hwloc/include/private/misc.h \ hwloc/include/private/cpuid.h +nodist_headers = hwloc/include/hwloc/autogen/config.h if HWLOC_HAVE_LINUX headers += \ @@ -63,4 +64,5 @@ endif HWLOC_HAVE_SCHED_SETAFFINITY if WANT_INSTALL_HEADERS opaldir = $(includedir)/openmpi/$(subdir) nobase_opal_HEADERS = $(headers) +nobase_nodist_opal_HEADERS = $(nodist_headers) endif