From 093515817bd8d1bd78944d1f3ee1b90dc4ba9d51 Mon Sep 17 00:00:00 2001 From: James Laird Date: Mon, 7 Feb 2005 12:59:42 -0500 Subject: [svn-r9952] Purpose: Bug fix Description: Typo in /hl/fortran/src Makefile.am caused obtuse compiler complaints from some compilers (but not others). Errors were of the form: gcc: cannot specify -o with -c or -S and multiple compilations Solution: In AM_CLFAGS, missed -I before ../../hl/src. This made gcc think that we also wanted to compile /hl/src directory. Fixed error by adding -I. Platforms tested: verbena, eirene. --- hl/fortran/src/Makefile.am | 2 +- hl/fortran/src/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index b50b239..9153247 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -11,7 +11,7 @@ include $(top_srcdir)/config/commence.am -AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src $(top_builddir)/hl/src +AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src # Our main target, the high-level fortran library diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 9824a38..3e55144 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -191,7 +191,7 @@ H5FC_PP = $(bindir)/h5pfc F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src $(top_builddir)/hl/src +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src # Our main target, the high-level fortran library -- cgit v0.12