From 6e78b7aabc4c32294afadd77340989f606288999 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 22 Jul 2015 09:10:50 -0400 Subject: [PATCH 1/2] topo/basic: remove stale (empty) .windows file (cherry picked from commit open-mpi/ompi@24ca887bd84b8995c0739ec26450b7c9628723d2) --- ompi/mca/topo/basic/.windows | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ompi/mca/topo/basic/.windows diff --git a/ompi/mca/topo/basic/.windows b/ompi/mca/topo/basic/.windows deleted file mode 100644 index e69de29bb2..0000000000 From 58534da8ce7138a6c575d26e57f31dbf62f48d28 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 22 Jul 2015 09:20:43 -0400 Subject: [PATCH 2/2] topo/basic: also remove .windows from Makefile.am (cherry picked from commit open-mpi/ompi@6929aca1b734c564968ccd5ba607e3280d0af057) --- ompi/mca/topo/basic/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ompi/mca/topo/basic/Makefile.am b/ompi/mca/topo/basic/Makefile.am index 75693d9fa6..9c261f7029 100644 --- a/ompi/mca/topo/basic/Makefile.am +++ b/ompi/mca/topo/basic/Makefile.am @@ -4,6 +4,7 @@ # reserved. # Copyright (c) 2011-2013 INRIA. All rights reserved. # Copyright (c) 2011-2013 Université Bordeaux 1 +# Copyright (c) 2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -11,8 +12,6 @@ # $HEADER$ # -EXTRA_DIST = .windows - sources = \ topo_basic.h \ topo_basic_component.c