wrappers: *_EXTRA_INCLUDES does not exist any more

There were a few places where *_EXTRA_INCLUDES (and derivates) were still being used. This commit removes all of them.
hjelmn · Feb 20, 2015 · 15be948 · 15be948
1 parent 9b716d9
commit 15be948
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/opal/tools/wrappers/opal.pc.in b/opal/tools/wrappers/opal.pc.in
@@ -21,4 +21,4 @@ Libs.private: @OPAL_WRAPPER_EXTRA_LIBS@
 # will not be installing this .pc file unless --enable-devel-headers is
 # selected, meaning that there will definitely be a value in EXTRA_INCLUDES.
 #
-Cflags: -I${includedir} -I${includedir}/@OPAL_WRAPPER_EXTRA_INCLUDES@ @OPAL_WRAPPER_EXTRA_CPPFLAGS@ @OPAL_WRAPPER_EXTRA_CFLAGS@
+Cflags: -I${includedir} @OPAL_WRAPPER_EXTRA_CPPFLAGS@ @OPAL_WRAPPER_EXTRA_CFLAGS@
diff --git a/orte/tools/wrappers/orte.pc.in b/orte/tools/wrappers/orte.pc.in
@@ -21,4 +21,4 @@ Libs.private: @ORTE_WRAPPER_EXTRA_LIBS@
 # will not be installing this .pc file unless --enable-devel-headers is
 # selected, meaning that there will definitely be a value in EXTRA_INCLUDES.
 #
-Cflags: -I${includedir} -I${includedir}/@ORTE_WRAPPER_EXTRA_INCLUDES@ @ORTE_WRAPPER_EXTRA_CPPFLAGS@ @ORTE_WRAPPER_EXTRA_CFLAGS@
+Cflags: -I${includedir} @ORTE_WRAPPER_EXTRA_CPPFLAGS@ @ORTE_WRAPPER_EXTRA_CFLAGS@
diff --git a/orte/tools/wrappers/orte_wrapper_script.in b/orte/tools/wrappers/orte_wrapper_script.in
@@ -4,7 +4,7 @@
 # Note that we use an interpreter value ("PERL") from configure
 # because even "#!/usr/bin/env perl" to all systems (e.g., NetBSD).
 #
-# Copyright (c) 2009-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2009-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -31,7 +31,6 @@ if (exists($ENV{'OPAL_DESTDIR'})
 
 my $CC = "@WRAPPER_CC@";
 my $CXX = "@CXX@";
-my $extra_includes = "@ORTE_WRAPPER_EXTRA_INCLUDES@";
 my $extra_cppflags = "@ORTE_WRAPPER_EXTRA_CPPFLAGS@";
 my $extra_cflags = "@ORTE_WRAPPER_EXTRA_CFLAGS@";
 my $extra_cflags_prefix = "@ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX@";
@@ -69,28 +68,16 @@ sub check_env {
     return $str;
 }
 
-sub add_extra_includes {
-    my $str = "";
-    my @includes = split(' ', $extra_includes);
-    for my $include (@includes) {
-        $str .= $include_flag . catdir($includedir, $include) . " ";
-    }
-
-    return $str;
-}
-
 
 if (basename($0) eq "ortecc") {
     $lang = "C";
     $comp = check_env("CC", $CC);
-    $preproc_flags .= " " . add_extra_includes();
     $comp_flags = $extra_cflags;
     $comp_flags_prefix = $extra_cflags_prefix;
     # no special libs for C
 } elsif (basename($0) eq "ortec++") {
     $lang = "C++";
     $comp = check_env("CXX", $CXX);
-    $preproc_flags .= " " . add_extra_includes();
     $comp_flags = $extra_cxxflags;
     $comp_flags_prefix = $extra_cxxflags_prefix;
 #    $libs = $cxx_lib . " " . $libs;

diff --git a/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in b/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in
@@ -1,6 +1,6 @@
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
-# Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2014-2015 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -21,7 +21,6 @@ language=C
 compiler_env=CC
 compiler_flags_env=CFLAGS
 compiler=@CC@
-extra_includes=@OMPI_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@