Fixes for VPATH builds

This commit was SVN r869.
2004-03-17 03:58:21 +00:00 · 2004-03-17 03:58:21 +00:00 · 86d2c8aca9
--- a/configure.ac
+++ b/configure.ac
@ -627,8 +627,8 @@ lam_show_subtitle "Wrapper compiler flags"
 # purely aesthetic.
 #

-CPPFLAGS='-I$(top_srcdir)/src -I$(top_srcdir)/src/include'" $CPPFLAGS"
-CXXCPPFLAGS='-I$(top_srcdir)/src  -I$(top_srcdir)/src/include'" $CXXCPPFLAGS"
+CPPFLAGS='-I$(top_srcdir)/src -I$(top_srcdir)/src/include -I$(top_builddir)/src'" $CPPFLAGS"
+CXXCPPFLAGS='-I$(top_srcdir)/src  -I$(top_srcdir)/src/include -I$(top_builddir)/src'" $CXXCPPFLAGS"

 #
 # Adding WRAPPER_* flags so that extra flags needed for wrappper compilers
--- a/src/lam/event/Makefile.am
+++ b/src/lam/event/Makefile.am
@ -1,5 +1,13 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies

+# LAM Get the dirs where lam_config.h and lam_config_bottom.h live.
+# Also specify where we can find this package's config.h because some
+# of the header files in this directory get included elsewhere in LAM.
+# #@%@#$...
+AM_CPPFLAGS = \
+        -I$(top_builddir)/../../include -I$(top_srcdir)/../../include \
+        -I$(top_builddir)/../..
+
 CFLAGS = -Wall @CFLAGS@
 # LAM: No need to build the sample or test
 #SUBDIRS = . sample test
--- a/src/lam/event/Makefile.in
+++ b/src/lam/event/Makefile.in
@ -186,6 +186,15 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign no-dependencies
+
+# LAM Get the dirs where lam_config.h and lam_config_bottom.h live.
+# Also specify where we can find this package's config.h because some
+# of the header files in this directory get included elsewhere in LAM.
+# #@%@#$...
+AM_CPPFLAGS = \
+        -I$(top_builddir)/../../include -I$(top_srcdir)/../../include \
+        -I$(top_builddir)/../..
+
 # LAM: No need to build the sample or test
 #SUBDIRS = . sample test
 EXTRA_DIST = acconfig.h err.c event.h evsignal.h event.3 kqueue.c \
--- a/src/lam/event/event.h
+++ b/src/lam/event/event.h
@ -34,7 +34,10 @@ extern "C" {
 #endif

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+  /* LAM: Conform to LAM's header file scheme -- specify the full
+     include path from "src/".  Also, config.h is a terrible
+     unqualified name for a header file.  :-) */
+#include "lam/event/config.h"
 #endif

 #ifdef HAVE_SYS_TIME_H
--- a/src/mca/lam/oob/base/Makefile.am
+++ b/src/mca/lam/oob/base/Makefile.am
@ -6,6 +6,10 @@ 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 = \
--- a/src/mca/lam/pcm/base/Makefile.am
+++ b/src/mca/lam/pcm/base/Makefile.am
@ -6,6 +6,10 @@ include $(top_srcdir)/config/Makefile.options

 noinst_LTLIBRARIES = libmca_pcm_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 = \
--- a/src/mca/lam/registry/base/Makefile.am
+++ b/src/mca/lam/registry/base/Makefile.am
@ -6,6 +6,10 @@ include $(top_srcdir)/config/Makefile.options

 noinst_LTLIBRARIES = libmca_registry_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 = \
--- a/src/mca/mpi/coll/Makefile.am
+++ b/src/mca/mpi/coll/Makefile.am
@ -7,6 +7,10 @@ include $(top_srcdir)/config/Makefile.options
 SUBDIRS = base $(MCA_coll_STATIC_SUBDIRS)
 DIST_SUBDIRS = base $(MCA_coll_ALL_SUBDIRS)

+# For VPATH builds, have to specify where static-modules.h will be found
+
+AM_CPPFLAGS = -I$(top_builddir)/src
+
 # Source code files

 headers = coll.h
--- a/src/mca/mpi/coll/base/Makefile.am
+++ b/src/mca/mpi/coll/base/Makefile.am
@ -6,6 +6,10 @@ include $(top_srcdir)/config/Makefile.options

 noinst_LTLIBRARIES = libmca_mpi_coll_base.la

+# For VPATH builds, have to specify where static-modules.h will be found
+
+AM_CPPFLAGS = -I$(top_builddir)/src
+
 headers = \
        base.h \
        coll_tags.h
--- a/src/mca/mpi/io/base/Makefile.am
+++ b/src/mca/mpi/io/base/Makefile.am
@ -3,3 +3,8 @@
 #

 include $(top_srcdir)/config/Makefile.options
+
+# For VPATH builds, have to specify where static-modules.h will be found
+
+AM_CPPFLAGS = -I$(top_builddir)/src
+
--- a/src/mca/mpi/one/base/Makefile.am
+++ b/src/mca/mpi/one/base/Makefile.am
@ -3,3 +3,8 @@
 #

 include $(top_srcdir)/config/Makefile.options
+
+# For VPATH builds, have to specify where static-modules.h will be found
+
+AM_CPPFLAGS = -I$(top_builddir)/src
+
--- a/src/mca/mpi/pml/base/Makefile.am
+++ b/src/mca/mpi/pml/base/Makefile.am
@ -6,6 +6,10 @@ include $(top_srcdir)/config/Makefile.options

 noinst_LTLIBRARIES = libmca_mpi_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 = \
--- a/src/mca/mpi/ptl/base/Makefile.am
+++ b/src/mca/mpi/ptl/base/Makefile.am
@ -6,6 +6,10 @@ include $(top_srcdir)/config/Makefile.options

 noinst_LTLIBRARIES = libmca_mpi_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 = \
--- a/src/mca/mpi/topo/base/Makefile.am
+++ b/src/mca/mpi/topo/base/Makefile.am
@ -6,6 +6,10 @@ include $(top_srcdir)/config/Makefile.options

 noinst_LTLIBRARIES = libmca_mpi_topo_base.la

+# For VPATH builds, have to specify where static-modules.h will be found
+
+AM_CPPFLAGS = -I$(top_builddir)/src
+
 headers = \
         base.h