Remove a bunch of -I's that are no longer necessary with

properly-prefixed static-component.h files. This commit was SVN r6342.
2005-07-04 18:24:58 +00:00 · 2005-07-04 18:24:58 +00:00 · 6a9c9953bc
--- a/configure.ac
+++ b/configure.ac
@ -1328,8 +1328,8 @@ ompi_show_subtitle "Wrapper compiler flags"
 # purely aesthetic.
 #

-CPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal -I$(top_builddir)/opal -I$(top_srcdir)/orte -I$(top_builddir)/orte -I$(top_srcdir)/ompi -I$(top_builddir)/ompi'" $CPPFLAGS"
-CXXCPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal -I$(top_builddir)/opal -I$(top_srcdir)/orte -I$(top_builddir)/orte -I$(top_srcdir)/ompi -I$(top_builddir)/ompi'" $CXXCPPFLAGS"
+CPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/opal -I$(top_srcdir)/orte -I$(top_srcdir)/ompi'" $CPPFLAGS"
+CXXCPPFLAGS='-I$(top_srcdir)/include -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/opal -I$(top_srcdir)/orte -I$(top_srcdir)/ompi'" $CXXCPPFLAGS"

 #
 # Adding WRAPPER_* flags so that extra flags needed for wrappper compilers
--- a/ompi/mca/allocator/base/allocator_base_open.c
+++ b/ompi/mca/allocator/base/allocator_base_open.c
@ -30,7 +30,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/allocator/base/static-components.h"
+#include "ompi/mca/allocator/base/static-components.h"

 /*
 * Global variables
--- a/ompi/mca/btl/base/btl_base_open.c
+++ b/ompi/mca/btl/base/btl_base_open.c
@ -57,7 +57,7 @@ OBJ_CLASS_INSTANCE(
 * component's public mca_base_component_t struct.
 */

-#include "mca/btl/base/static-components.h"
+#include "ompi/mca/btl/base/static-components.h"


 /*
--- a/ompi/mca/coll/base/coll_base_open.c
+++ b/ompi/mca/coll/base/coll_base_open.c
@ -32,7 +32,7 @@
 * statements and the definition of an array of pointers to each
 * component's public mca_base_component_t struct.
 */
-#include "mca/coll/base/static-components.h"
+#include "ompi/mca/coll/base/static-components.h"



--- a/ompi/mca/io/base/io_base_open.c
+++ b/ompi/mca/io/base/io_base_open.c
@ -36,7 +36,7 @@
 #ifdef WIN32
    const mca_base_component_t *mca_io_base_static_components[] = {NULL};
 #else 
-#include "mca/io/base/static-components.h"
+#include "ompi/mca/io/base/static-components.h"
 #endif

 /*
--- a/ompi/mca/io/romio/romio-dist/adio/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/Makefile.am
@ -16,20 +16,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = -DHAVE_MPI_INFO \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
-        -I$(top_ompi_srcdir)/opal \
-        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
-        -I$(top_ompi_srcdir)/orte \
-        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
-        -I$(top_ompi_srcdir)/ompi \
-        -I$(top_ompi_srcdir)/ompi/include
-
 # Conditionals whether to build each subdir or not

 if BUILD_HFS
--- a/ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_nfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_ufs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/adio/common/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/adio/common/Makefile.am
@ -21,16 +21,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/adio/include
--- a/ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am
+++ b/ompi/mca/io/romio/romio-dist/mpi-io/Makefile.am
@ -25,16 +25,10 @@ AM_CPPFLAGS = \
        -I$(top_ompi_srcdir) \
        -I$(top_ompi_srcdir)/include \
        -I$(top_ompi_builddir)/include \
-        -I$(top_ompi_builddir)/opal \
-        -I$(top_ompi_builddir)/opal/include \
        -I$(top_ompi_srcdir)/opal \
        -I$(top_ompi_srcdir)/opal/include \
-        -I$(top_ompi_builddir)/orte \
-        -I$(top_ompi_builddir)/orte/include \
        -I$(top_ompi_srcdir)/orte \
        -I$(top_ompi_srcdir)/orte/include \
-        -I$(top_ompi_builddir)/ompi \
-        -I$(top_ompi_builddir)/ompi/include \
        -I$(top_ompi_srcdir)/ompi \
        -I$(top_ompi_srcdir)/ompi/include \
        -I$(top_srcdir)/include \
--- a/ompi/mca/mpool/base/mpool_base_open.c
+++ b/ompi/mca/mpool/base/mpool_base_open.c
@ -33,7 +33,7 @@
 #ifdef WIN32
    const mca_base_component_t *mca_mpool_base_static_components[] = {NULL};
 #else 
-#include "mca/mpool/base/static-components.h"
+#include "ompi/mca/mpool/base/static-components.h"
 #endif


--- a/ompi/mca/pml/base/pml_base_open.c
+++ b/ompi/mca/pml/base/pml_base_open.c
@ -30,7 +30,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/pml/base/static-components.h"
+#include "ompi/mca/pml/base/static-components.h"

 int mca_pml_base_progress(void) 
 {
--- a/ompi/mca/ptl/base/ptl_base_open.c
+++ b/ompi/mca/ptl/base/ptl_base_open.c
@ -32,7 +32,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/ptl/base/static-components.h"
+#include "ompi/mca/ptl/base/static-components.h"


 /*
--- a/ompi/mca/topo/base/topo_base_open.c
+++ b/ompi/mca/topo/base/topo_base_open.c
@ -30,7 +30,7 @@
 * statements and the definition of an array of pointers to each component's
 * public mca_base_component_t struct.
 */
-#include "mca/topo/base/static-components.h"
+#include "ompi/mca/topo/base/static-components.h"

 /*
 * Global variables
--- a/orte/mca/errmgr/base/errmgr_base_open.c
+++ b/orte/mca/errmgr/base/errmgr_base_open.c
@ -32,7 +32,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/errmgr/base/static-components.h"
+#include "orte/mca/errmgr/base/static-components.h"

 /*
 * globals
--- a/orte/mca/gpr/base/gpr_base_open.c
+++ b/orte/mca/gpr/base/gpr_base_open.c
@ -33,7 +33,7 @@
 * component's public mca_base_module_t struct.
 */

-#include "mca/gpr/base/static-components.h"
+#include "orte/mca/gpr/base/static-components.h"

 /*
 * globals
--- a/orte/mca/iof/base/iof_base_open.c
+++ b/orte/mca/iof/base/iof_base_open.c
@ -33,7 +33,7 @@
 * component's public orte_base_component_t struct.
 */

-#include "mca/iof/base/static-components.h"
+#include "orte/mca/iof/base/static-components.h"


 /*
--- a/orte/mca/ns/base/ns_base_open.c
+++ b/orte/mca/ns/base/ns_base_open.c
@ -35,7 +35,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/ns/base/static-components.h"
+#include "orte/mca/ns/base/static-components.h"

 /*
 * globals
--- a/orte/mca/oob/base/oob_base_open.c
+++ b/orte/mca/oob/base/oob_base_open.c
@ -29,7 +29,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/oob/base/static-components.h"
+#include "orte/mca/oob/base/static-components.h"


 /*
--- a/orte/mca/pls/base/pls_base_open.c
+++ b/orte/mca/pls/base/pls_base_open.c
@ -29,7 +29,7 @@
 * module's public mca_base_module_t struct.
 */

-#include "mca/pls/base/static-components.h"
+#include "orte/mca/pls/base/static-components.h"


 /*
--- a/orte/mca/ras/base/ras_base_open.c
+++ b/orte/mca/ras/base/ras_base_open.c
@ -31,7 +31,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/ras/base/static-components.h"
+#include "orte/mca/ras/base/static-components.h"

 /**
 * Local functions.
--- a/orte/mca/rds/base/rds_base_open.c
+++ b/orte/mca/rds/base/rds_base_open.c
@ -33,7 +33,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/rds/base/static-components.h"
+#include "orte/mca/rds/base/static-components.h"

 /**
 * Local functions.
--- a/orte/mca/rmaps/base/rmaps_base_open.c
+++ b/orte/mca/rmaps/base/rmaps_base_open.c
@ -31,7 +31,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/rmaps/base/static-components.h"
+#include "orte/mca/rmaps/base/static-components.h"


 /*
--- a/orte/mca/rmgr/base/rmgr_base_open.c
+++ b/orte/mca/rmgr/base/rmgr_base_open.c
@ -36,7 +36,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/rmgr/base/static-components.h"
+#include "orte/mca/rmgr/base/static-components.h"

 /*
 * globals
--- a/orte/mca/rml/base/rml_base_open.c
+++ b/orte/mca/rml/base/rml_base_open.c
@ -32,7 +32,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/rml/base/static-components.h"
+#include "orte/mca/rml/base/static-components.h"


 /*
--- a/orte/mca/schema/base/schema_base_open.c
+++ b/orte/mca/schema/base/schema_base_open.c
@ -30,7 +30,7 @@
 * component's public mca_base_module_t struct.
 */

-#include "mca/schema/base/static-components.h"
+#include "orte/mca/schema/base/static-components.h"

 /*
 * globals
--- a/orte/mca/soh/base/soh_base_open.c
+++ b/orte/mca/soh/base/soh_base_open.c
@ -39,7 +39,7 @@
 * component's public mca_base_component_t struct.
 */

-#include "mca/soh/base/static-components.h"
+#include "orte/mca/soh/base/static-components.h"

 /*
 * globals