Remove lots of unnecessary AM_CPPFLAGS

This commit was SVN r1382.
2004-06-17 19:25:08 +00:00 · 2004-06-17 19:25:08 +00:00 · ab24783107
--- a/src/mca/allocator/bucket/Makefile.am
+++ b/src/mca/allocator/bucket/Makefile.am
@ -17,7 +17,7 @@ else
 module_noinst = libmca_allocator_bucket.la
 module_install =
 endif
-                                                                                                          
+
 mcamoduledir = $(libdir)/openmpi
 mcamodule_LTLIBRARIES = $(module_install)
 mca_allocator_bucket_la_SOURCES = $(sources)
--- a/src/mca/base/Makefile.am
+++ b/src/mca/base/Makefile.am
@ -4,6 +4,9 @@

 include $(top_srcdir)/config/Makefile.options

+# Need this so that the base knows where to load dynamic modules from
+# (by default)
+
 AM_CPPFLAGS = -DOMPI_PKGLIBDIR=\"$(pkglibdir)\"

 noinst_LTLIBRARIES = libmca_base.la
--- a/src/mca/gpr/Makefile.am
+++ b/src/mca/gpr/Makefile.am
@ -5,20 +5,3 @@

 include $(top_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-            -DOMPI_PREFIX="\"$(prefix)\"" \
-            -DOMPI_BINDIR="\"$(bindir)\"" \
-            -DOMPI_LIBDIR="\"$(libdir)\"" \
-            -DOMPI_INCDIR="\"$(includedir)\"" \
-            -DOMPI_PKGLIBDIR="\"$(pkglibdir)\"" \
-            -DOMPI_SYSCONFDIR="\"$(sysconfdir)\"" \
-            -DOMPI_CONFIGURE_USER="\"@OMPI_CONFIGURE_USER@\"" \
-            -DOMPI_CONFIGURE_HOST="\"@OMPI_CONFIGURE_HOST@\"" \
-            -DOMPI_CONFIGURE_DATE="\"@OMPI_CONFIGURE_DATE@\""
-
-libs = $(top_builddir)/src/libmpi.la
-
-bin_PROGRAMS = 
-
-clean-local:
-	test -z "$(OMPI_CXX_TEMPLATE_REPOSITORY)" || $(RM) -rf $(OMPI_CXX_TEMPLATE_REPOSITORY)
--- a/src/mca/io/romio/src/Makefile.am
+++ b/src/mca/io/romio/src/Makefile.am
@ -7,11 +7,6 @@ include $(top_ompi_srcdir)/config/Makefile.options

 SUBDIRS = romio-1.2.5.1

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_io_romio.la
 libmca_io_romio_la_SOURCES = \
 	io_romio_module.c  \
--- a/src/mca/oob/cofs/src/Makefile.am
+++ b/src/mca/oob/cofs/src/Makefile.am
@ -4,11 +4,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_oob_cofs.la
 libmca_oob_cofs_la_SOURCES = \
 	oob_cofs.h \
--- a/src/mca/pcm/cofs/src/Makefile.am
+++ b/src/mca/pcm/cofs/src/Makefile.am
@ -4,11 +4,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_pcm_cofs.la
 libmca_pcm_cofs_la_SOURCES = \
 	pcm_cofs.h \
--- a/src/mca/pcm/rsh/src/Makefile.am
+++ b/src/mca/pcm/rsh/src/Makefile.am
@ -4,11 +4,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_pcm_rsh.la
 libmca_pcm_rsh_la_SOURCES = \
 	pcm_rsh.h \
--- a/src/mca/pml/base/Makefile.am
+++ b/src/mca/pml/base/Makefile.am
@ -8,9 +8,7 @@ noinst_LTLIBRARIES = libmca_pml_base.la

 # For VPATH builds, have to specify where static-modules.h will be found

-AM_CPPFLAGS = \
-	-pedantic \
-	-I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_builddir)/src

 # Source code files

--- a/src/mca/pml/teg/src/Makefile.am
+++ b/src/mca/pml/teg/src/Makefile.am
@ -5,11 +5,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_pml_teg.la
 libmca_pml_teg_la_SOURCES = \
 	pml_teg.c \
--- a/src/mca/ptl/elan/src/Makefile.am
+++ b/src/mca/ptl/elan/src/Makefile.am
@ -5,12 +5,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_builddir)/src/ompi/event \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_ptl_elan.la
 libmca_ptl_elan_la_SOURCES = \
 	ptl_elan.h \
--- a/src/mca/ptl/self/src/Makefile.am
+++ b/src/mca/ptl/self/src/Makefile.am
@ -5,12 +5,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_builddir)/src/ompi/event \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_ptl_self.la
 libmca_ptl_self_la_SOURCES = \
 	ptl_self.c \
--- a/src/mca/ptl/sm/src/Makefile.am
+++ b/src/mca/ptl/sm/src/Makefile.am
@ -5,11 +5,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_ptl_sm.la
 libmca_ptl_sm_la_SOURCES = \
 	ptl_sm.c \
--- a/src/mca/ptl/tcp/src/Makefile.am
+++ b/src/mca/ptl/tcp/src/Makefile.am
@ -5,11 +5,6 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-AM_CPPFLAGS = \
-        -I$(top_ompi_builddir)/src/include \
-        -I$(top_ompi_srcdir)/src \
-        -I$(top_ompi_srcdir)/src/include
-
 noinst_LTLIBRARIES = libmca_ptl_tcp.la
 libmca_ptl_tcp_la_SOURCES = \
 	ptl_tcp.c \