- Add to AM_CPPFLAGS $(OPAL_LTDL_CPPFLAGS) where necessary in order to

add a -I to find the included ltdl.h (vs. a system-installed ltdl.h)
- Clean up kruft in a bunch of Makefile.am's to remove now-unnecessary
  AM_CPPFLAGS settings to get static-components.h for each framework
- Move the component_repository API functions out of opal/mca/base/base.h
  and into opal/mca/base/mca_base_component_repository.h in order to
  decrease unnecessary dependencies (e.g., before this, almost
  everything in the tree depended on ltdl.h, which is unnecessary --
  only a small number of files really need ltdl.h)

This commit was SVN r7127.

configure.ac

@@ -1462,6 +1462,14 @@ AM_CONDITIONAL(WANT_LIBLTDL, test "$WANT_LIBLTDL" = "1")
 AC_DEFINE_UNQUOTED(OMPI_WANT_LIBLTDL, $WANT_LIBLTDL,
     [Whether to include support for libltdl or not])
 
+# Have a variable that can be used to indicate where ltdl.h lives.  Do
+# this specifically so that we get the included ltdl.h (which we know
+# will work properly with the compiled code, including libltdl), not
+# the system one (which is likely to be far too old and buggy).
+
+OPAL_LTDL_CPPFLAGS='-I$(top_srcdir)/opal/libltdl'
+AC_SUBST(OPAL_LTDL_CPPFLAGS)
+
 
 ############################################################################
 # final wrapper compiler config
@@ -1471,11 +1479,15 @@ ompi_show_subtitle "Wrapper compiler flags"
 
 #
 # This is needed for VPATH builds, so that it will -I the appropriate
-# include directory (don't know why automake doesn't do this
+# include directory.  We delayed doing it until now just so that
-# automatically).  We delayed doing it until now just so that
 # '-I$(top_srcdir)' doesn't show up in any of the configure output --
 # purely aesthetic.
 #
+# JMS: Someday to remove the -I's for the individual ompi, orte, opal
+# directories -- the top-level ones will suffice after all #include's
+# throughout the tree are converted to use the full path of our header
+# files.
+#
 
 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"

ompi/mca/allocator/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_allocator_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

ompi/mca/bml/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_bml_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

ompi/mca/btl/base/Makefile.am

@@ -16,12 +16,10 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 noinst_LTLIBRARIES = libmca_btl_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

ompi/mca/btl/base/btl_base_select.c

@@ -17,13 +17,14 @@
 #include "ompi_config.h"
 
 #include "opal/util/argv.h"
-#include "runtime/runtime.h"
 #include "opal/util/show_help.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
-#include "mca/pml/pml.h"
+#include "opal/mca/base/mca_base_component_repository.h"
-#include "mca/btl/btl.h"
+#include "ompi/mca/pml/pml.h"
-#include "mca/btl/base/base.h"
+#include "ompi/mca/btl/btl.h"
+#include "ompi/mca/btl/base/base.h"
+#include "orte/runtime/runtime.h"
 
 OBJ_CLASS_INSTANCE(
    mca_btl_base_selected_module_t,

ompi/mca/coll/base/Makefile.am

@@ -18,6 +18,8 @@ include $(top_srcdir)/config/Makefile.options
 
 EXTRA_DIST = $(pkgdata_DATA)
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 noinst_LTLIBRARIES = libmca_coll_base.la
 
 pkgdata_DATA = help-mca-coll-base.txt

ompi/mca/coll/base/coll_base_find_available.c

@@ -25,10 +25,11 @@
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
 #include "opal/util/show_help.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
-#include "mca/coll/coll.h"
+#include "opal/mca/base/mca_base_component_repository.h"
-#include "mca/coll/base/base.h"
+#include "ompi/mca/coll/coll.h"
+#include "ompi/mca/coll/base/base.h"
 
 
 /*

ompi/mca/io/base/Makefile.am

@@ -16,6 +16,8 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 noinst_LTLIBRARIES = libmca_io_base.la
 
 headers = \

ompi/mca/io/base/io_base_find_available.c

@@ -23,11 +23,12 @@
 #include "ompi/include/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
-#include "mca/io/io.h"
+#include "opal/mca/base/mca_base_component_repository.h"
-#include "mca/io/base/base.h"
+#include "ompi/mca/io/io.h"
-#include "mca/io/base/io_base_request.h"
+#include "ompi/mca/io/base/base.h"
+#include "ompi/mca/io/base/io_base_request.h"
 
 
 

ompi/mca/mpool/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_mpool_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

ompi/mca/pml/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_pml_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

ompi/mca/ptl/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_ptl_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

ompi/mca/topo/base/Makefile.am

@@ -16,6 +16,8 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 noinst_LTLIBRARIES = libmca_topo_base.la
 
 headers = \

ompi/mca/topo/base/topo_base_find_available.c

@@ -20,13 +20,14 @@
 #include <stdlib.h>
 
 #include "mpi.h"
-#include "ompi/include/constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
-#include "mca/topo/topo.h"
+#include "opal/mca/base/mca_base_component_repository.h"
-#include "mca/topo/base/base.h"
+#include "ompi/mca/topo/topo.h"
+#include "ompi/mca/topo/base/base.h"
+#include "ompi/include/constants.h"
 
 opal_list_t mca_topo_base_modules_available;
 bool mca_topo_base_modules_available_valid = false;

opal/mca/base/Makefile.am

@@ -20,9 +20,9 @@ include $(top_srcdir)/config/Makefile.options
 # (by default)
 
 AM_CPPFLAGS = \
+        $(OPAL_LTDL_CPPFLAGS) \
         -DOMPI_PKGLIBDIR=\"$(pkglibdir)\" \
-        -DOMPI_SYSCONFDIR=\"$(sysconfdir)\" \
+        -DOMPI_SYSCONFDIR=\"$(sysconfdir)\"
-        -I$(top_srcdir)/opal/libltdl
 AM_LFLAGS = -Pmca_base_yy
 LEX_OUTPUT_ROOT = lex.mca_base_yy
 
@@ -36,6 +36,7 @@ pkgdata_DATA = help-mca-base.txt help-mca-param.txt
 
 headers = \
         base.h \
+        mca_base_component_repository.h \
         mca_base_msgbuf.h \
         mca_base_msgbuf_internal.h \
         mca_base_param.h \

opal/mca/base/base.h

@@ -19,10 +19,6 @@
 
 #include "ompi_config.h"
 
-#if OMPI_WANT_LIBLTDL
-#include "ltdl.h"
-#endif
-
 #include "opal/class/opal_object.h"
 
 /*
@@ -124,26 +120,6 @@ OMPI_DECLSPEC  int mca_base_component_find(const char *directory, const char *ty
                            opal_list_t *found_components,
                            bool open_dso_components);
 
-  /* mca_base_component_register.c */
-
-#if ! OMPI_WANT_LIBLTDL
-    /* if we don't have libltdl, provide dummy handle type */
-    typedef void* lt_dlhandle;
-#endif
-
-OMPI_DECLSPEC  int mca_base_component_repository_initialize(void);
-OMPI_DECLSPEC  int mca_base_component_repository_retain(char *type, 
-                                        lt_dlhandle component_handle, 
-                                        const mca_base_component_t *component_struct);
-OMPI_DECLSPEC int mca_base_component_repository_retain_component(const char *type, 
-                                                                 const char *name);
-OMPI_DECLSPEC  int mca_base_component_repository_link(const char *src_type, 
-                                      const char *src_name,
-                                      const char *depend_type,
-                                      const char *depend_name);
-OMPI_DECLSPEC  void mca_base_component_repository_release(const mca_base_component_t *component);
-OMPI_DECLSPEC  void mca_base_component_repository_finalize(void);
-
   /* mca_base_components_open.c */
 
 OMPI_DECLSPEC  int mca_base_components_open(const char *type_name, int output_id,

opal/mca/base/mca_base_close.c

@@ -19,6 +19,7 @@
 #include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_component_repository.h"
 #include "ompi/include/constants.h"
 
 /*

opal/mca/base/mca_base_component_find.c

@@ -22,14 +22,16 @@
 #include <stdlib.h>
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> */ 
+/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
-#include "opal/libltdl/ltdl.h"
+   directory's Makefile.am to get opal/libltdl */ 
+#include "ltdl.h"
 #endif
 
 #include "opal/util/output.h"
 #include "opal/class/opal_list.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_component_repository.h"
 #include "ompi/include/constants.h"
 
 

opal/mca/base/mca_base_component_repository.c

@@ -24,13 +24,15 @@
 #include <stdio.h>
 
 #if OMPI_WANT_LIBLTDL
-/* Ensure to get the right <ltdl.h> */ 
+/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
-#include "opal/libltdl/ltdl.h"
+   directory's Makefile.am to get opal/libltdl */ 
+#include "ltdl.h"
 #endif
 
 #include "opal/class/opal_list.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_component_repository.h"
 #include "ompi/include/constants.h"
 
 #if OMPI_WANT_LIBLTDL
@@ -89,7 +91,7 @@ static int link_items(repository_item_t *src, repository_item_t *depend);
 /*
  * Initialize the repository
  */
-int mca_base_component_repository_initialize(void)
+int mca_base_component_repository_init(void)
 {
   /* Setup internal structures */
 

opal/mca/base/mca_base_component_repository.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */
+
+#ifndef MCA_BASE_COMPONENT_REPOSITORY_H
+#define MCA_BASE_COMPONENT_REPOSITORY_H
+
+#include "ompi_config.h"
+
+#if OMPI_WANT_LIBLTDL
+/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
+   directory's Makefile.am to get opal/libltdl */ 
+#include "ltdl.h"
+#else
+/* if we don't have libltdl, provide dummy handle type */
+typedef void* lt_dlhandle;
+#endif
+
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
+
+    OMPI_DECLSPEC int mca_base_component_repository_init(void);
+    OMPI_DECLSPEC int mca_base_component_repository_retain(char *type, 
+                              lt_dlhandle component_handle, 
+                              const mca_base_component_t *component_struct);
+    OMPI_DECLSPEC int mca_base_component_repository_retain_component(const char *type, 
+                              const char *name);
+    OMPI_DECLSPEC int mca_base_component_repository_link(const char *src_type, 
+                              const char *src_name,
+                              const char *depend_type,
+                              const char *depend_name);
+    OMPI_DECLSPEC void mca_base_component_repository_release(const mca_base_component_t *component);
+    OMPI_DECLSPEC void mca_base_component_repository_finalize(void);
+    
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
+
+#endif /* MCA_BASE_COMPONENT_REPOSITORY_H */

opal/mca/base/mca_base_components_close.c

@@ -20,6 +20,7 @@
 #include "opal/util/output.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_component_repository.h"
 #include "ompi/include/constants.h"
 
 int mca_base_components_close(int output_id, 

opal/mca/base/mca_base_components_open.c

@@ -27,6 +27,7 @@
 #include "opal/util/show_help.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_component_repository.h"
 #include "ompi/include/constants.h"
 
 struct component_name_t {

opal/mca/base/mca_base_open.c

@@ -27,6 +27,7 @@
 #include "opal/util/printf.h"
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
+#include "opal/mca/base/mca_base_component_repository.h"
 #include "ompi/include/constants.h"
 
 /*
@@ -100,7 +101,7 @@ int mca_base_open(void)
 
   /* Open up the component repository */
 
-  return mca_base_component_repository_initialize();
+  return mca_base_component_repository_init();
 }
 
 

orte/mca/errmgr/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_errmgr_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/gpr/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_gpr_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/iof/base/Makefile.am

@@ -16,12 +16,10 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 noinst_LTLIBRARIES = libmca_iof_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/iof/base/iof_base_select.c

@@ -17,10 +17,11 @@
 #include "ompi_config.h"
 
 #include "opal/util/output.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
-#include "mca/iof/iof.h"
+#include "opal/mca/base/mca_base_component_repository.h"
-#include "mca/iof/base/base.h"
+#include "orte/mca/iof/iof.h"
+#include "orte/mca/iof/base/base.h"
 
 orte_iof_base_module_t orte_iof;
 

orte/mca/ns/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_ns_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/oob/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_oob_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/pls/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_pls_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/ras/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_ras_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/rds/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_rds_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/rmaps/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_rmaps_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/rmgr/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_rmgr_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/rml/base/Makefile.am

@@ -16,12 +16,10 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 noinst_LTLIBRARIES = libmca_rml_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/rml/base/rml_base_select.c

@@ -18,10 +18,11 @@
 
 #include "include/constants.h"
 #include "opal/util/output.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
-#include "mca/rml/rml.h"
+#include "opal/mca/base/mca_base_component_repository.h"
-#include "mca/rml/base/base.h"
+#include "orte/mca/rml/rml.h"
+#include "orte/mca/rml/base/base.h"
 
 
 /**

orte/mca/schema/base/Makefile.am

@@ -20,10 +20,6 @@ SUBDIRS =
 
 noinst_LTLIBRARIES = libmca_schema_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

orte/mca/sds/base/Makefile.am

@@ -16,6 +16,8 @@
 
 include $(top_srcdir)/config/Makefile.options
 
+AM_CPPFLAGS = $(OPAL_LTDL_CPPFLAGS)
+
 noinst_LTLIBRARIES = libmca_sds_base.la
 
 # Source code files

orte/mca/sds/base/sds_base_select.c

@@ -16,12 +16,13 @@
 
 #include "orte_config.h"
 
-#include "include/orte_constants.h"
 #include "opal/class/opal_list.h"
 #include "opal/util/output.h"
-#include "mca/mca.h"
+#include "opal/mca/mca.h"
-#include "mca/base/base.h"
+#include "opal/mca/base/base.h"
-#include "mca/sds/base/base.h"
+#include "opal/mca/base/mca_base_component_repository.h"
+#include "orte/include/orte_constants.h"
+#include "orte/mca/sds/base/base.h"
 
 extern opal_list_t orte_sds_base_components_available;
 extern orte_sds_base_module_t *orte_sds_base_module;

orte/mca/soh/base/Makefile.am

@@ -18,10 +18,6 @@ include $(top_srcdir)/config/Makefile.options
 
 noinst_LTLIBRARIES = libmca_soh_base.la
 
-# For VPATH builds, have to specify where static-modules.h will be found
-
-AM_CPPFLAGS = -I$(top_builddir)/src
-
 # Source code files
 
 headers = \

test/support/Makefile.am

@@ -17,6 +17,7 @@
 include $(top_srcdir)/test/support/Makefile.options
 
 AM_CPPFLAGS += \
+        $(OPAL_LTDL_CPPFLAGS) \
         -DBUILDDIR=\"$(OMPI_TOP_BUILDDIR)\" \
         -DSRCDIR=\"$(OMPI_TOP_SRCDIR)\"
 

test/support/components.c

@@ -20,9 +20,12 @@
 
 #include "ompi/include/constants.h"
 #include "opal/include/constants.h"
-#include "libltdl/ltdl.h"
+#include "opal/mca/mca.h"
+/* Ensure to get the right <ltdl.h> -- a -I should be setup in this
+   directory's Makefile.am to get opal/libltdl */ 
+#include "ltdl.h"
+
 #include "components.h"
-#include "mca/mca.h"
 
 
 /*