Take $(CFLAGS) or $(CXXFLAGS) into account when determining dependencies

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4858 17b73243-c579-4c4c-a9d2-2d5706c11dac

11 files changed, 28 insertions, 28 deletions

diff --git a/lib/make/configure b/lib/make/configure
index 8ad0dc99..52d07212 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -6865,10 +6865,10 @@ cat > conftest.$ac_ext <<EOF
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char 6Okejz;
+char ztM5Ye;
 
 int main() {
-1xVIuB
+BKDkue
 ; return 0; }
 EOF
 if { (eval echo configure:6875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -7416,12 +7416,12 @@ LDFLAGS="$LDFLAGS $KNOWN_LDFLAGS"
 
 # How to generate dependency info
 
-: ${C_DEPEND='$(CC) -E -M $(CPPFLAGS)'}
+: ${C_DEPEND='$(CC) -E -M $(CPPFLAGS) $(CFLAGS)'}
 
 : ${C_DEPEND_OUT=' > $@'}
 
 
-: ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS)'}
+: ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS) $(CXXFLAGS)'}
 
 : ${CXX_DEPEND_OUT=' > $@'}
 
diff --git a/lib/make/configure.in b/lib/make/configure.in
index f6fcfe10..67c656d9 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -1249,12 +1249,12 @@ AC_SUBST(CACTUSLIBLINKLINE)
 
 # How to generate dependency info
 AC_SUBST(C_DEPEND)
-: ${C_DEPEND='$(CC) -E -M $(CPPFLAGS)'}
+: ${C_DEPEND='$(CC) -E -M $(CPPFLAGS) $(CFLAGS)'}
 AC_SUBST(C_DEPEND_OUT)
 : ${C_DEPEND_OUT=' > $@'}
 
 AC_SUBST(CXX_DEPEND)
-: ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS)'}
+: ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS) $(CXXFLAGS)'}
 AC_SUBST(CXX_DEPEND_OUT)
 : ${CXX_DEPEND_OUT=' > $@'}
 
diff --git a/lib/make/known-architectures/aix b/lib/make/known-architectures/aix
index 5044ff17..c0a38290 100644
--- a/lib/make/known-architectures/aix
+++ b/lib/make/known-architectures/aix
@@ -88,7 +88,7 @@ else
      CC_VERSION="`$CC -v 2>&1 | grep -i version | tail -n1`"
      ;;
     cc|xlc|xlc_r)
-     : ${C_DEPEND='$(CC) -E -M $(CPPFLAGS)'}
+     : ${C_DEPEND='$(CC) -E -M $(CPPFLAGS) $(CFLAGS)'}
      : ${C_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'}
      : ${CFLAGS="-q$AIX_BITS -qlanglvl=stdc99"}
      : ${C_OPTIMISE_FLAGS="-O3 -qarch=auto -qtune=auto -qcache=auto -qhot"}
@@ -105,7 +105,7 @@ else
      CXX_VERSION="`$CXX -v 2>&1 | grep -i version | tail -n1`"
      ;;
     xlC|xlC_r)
-     : ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS)'}
+     : ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS) $(CXXFLAGS)'}
      : ${CXX_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).u $@'}
      : ${CXXFLAGS="-q$AIX_BITS"}
      : ${CXX_OPTIMISE_FLAGS="-O3 -qarch=auto -qtune=auto -qcache=auto -qhot"}
diff --git a/lib/make/known-architectures/bgl b/lib/make/known-architectures/bgl
index 35df217c..cf57a2bf 100644
--- a/lib/make/known-architectures/bgl
+++ b/lib/make/known-architectures/bgl
@@ -65,7 +65,7 @@ else
   # C/C++ compilers
   case "$CC" in
     blrts_xlc)
-     : ${C_DEPEND='$(CC) -M $(CPPFLAGS)'}
+     : ${C_DEPEND='$(CC) -M $(CPPFLAGS) $(CFLAGS)'}
      : ${C_DEPEND_OUT=' 2> /dev/null; mv $(basename $(basename $@)).d $@'}
      : ${CFLAGS="-qmaxmem=64000 -qlanglvl=stdc99"}
      : ${C_OPTIMISE_FLAGS='-O2 -qarch=440'}
@@ -77,7 +77,7 @@ else
 
   case "$CXX" in
     blrts_xlC)
-     : ${CXX_DEPEND='$(CXX) -M $(CPPFLAGS)'}
+     : ${CXX_DEPEND='$(CXX) -M $(CPPFLAGS) $(CXXFLAGS)'}
      : ${CXX_DEPEND_OUT=' 2> /dev/null; mv $(basename $(basename $@)).d $@'}
      : ${CXXFLAGS="-qmaxmem=64000 -qlanglvl=stdc99"}
      : ${CXX_OPTIMISE_FLAGS='-O2 -qarch=440'}
diff --git a/lib/make/known-architectures/cygwin b/lib/make/known-architectures/cygwin
index 764c58a5..bb780612 100644
--- a/lib/make/known-architectures/cygwin
+++ b/lib/make/known-architectures/cygwin
@@ -163,8 +163,8 @@ else
 
 # The -nostdinc stops it picking stdio.h, etc, from the GNU headers.
 # The -x c++ is because some of the Windows headers contain C++ comments
-  C_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) '
-  CXX_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) '
+  C_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) $(CFLAGS) '
+  CXX_DEPEND='$(CPP) -x c++ -E -MM -nostdinc -D_WIN32 $(CPPFLAGS) $(CXXFLAGS) '
 
 # Add in system include dirs from $(INCLUDE).  These may contain spaces.
 # The -D_M_IX86 is necessary for things like winnt.h.  Since this is
diff --git a/lib/make/known-architectures/darwin b/lib/make/known-architectures/darwin
index 055d80c5..ffcecfda 100644
--- a/lib/make/known-architectures/darwin
+++ b/lib/make/known-architectures/darwin
@@ -70,11 +70,11 @@ else
   fi
 
   if test "$MAC_C_COMP" = "gcc" ; then
-    : ${C_DEPEND='$(CC) -M -MP $(CPPFLAGS)'}
-    : ${CXX_DEPEND='$(CXX) -M -MP $(CPPFLAGS)'}
+    : ${C_DEPEND='$(CC) -M -MP $(CPPFLAGS) $(CFLAGS)'}
+    : ${CXX_DEPEND='$(CXX) -M -MP $(CPPFLAGS) $(CXXFLAGS)'}
   elif test "$MAC_C_COMP" = "intel" ; then
-    : ${C_DEPEND='$(CC) -M $(CPPFLAGS)'}
-    : ${CXX_DEPEND='$(CXX) -M $(CPPFLAGS)'}
+    : ${C_DEPEND='$(CC) -M $(CPPFLAGS) $(CFLAGS)'}
+    : ${CXX_DEPEND='$(CXX) -M $(CPPFLAGS) $(CXXFLAGS)'}
   else
     : ${C_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'}
     : ${CXX_DEPEND='$(PERL) $(CCTK_HOME)/lib/sbin/cpp.pl -M $(CPPFLAGS)'}
diff --git a/lib/make/known-architectures/hiuxwe2 b/lib/make/known-architectures/hiuxwe2
index a7b7871a..0289bf1d 100644
--- a/lib/make/known-architectures/hiuxwe2
+++ b/lib/make/known-architectures/hiuxwe2
@@ -76,8 +76,8 @@ else
   fi
 
   # /lib/cpp cannot generate dependencies on this machine but we have gcc.
-  : ${C_DEPEND='gcc -E -M $(CPPFLAGS)'}
-  : ${CXX_DEPEND='$(C_DEPEND)'}
+  : ${C_DEPEND='gcc -E -M $(CPPFLAGS) $(CFLAGS)'}
+  : ${CXX_DEPEND='$(C_DEPEND) $(CXXFLAGS)'}
   : ${F_DEPEND='$(C_DEPEND) -x c'}
   : ${F77_DEPEND='$(F_DEPEND)'}
 
diff --git a/lib/make/known-architectures/hp-ux b/lib/make/known-architectures/hp-ux
index e3408d9c..f61712ae 100644
--- a/lib/make/known-architectures/hp-ux
+++ b/lib/make/known-architectures/hp-ux
@@ -17,8 +17,8 @@ else
 
   : ${LIBS="cl F90 m"}
   : ${LIBDIRS="/opt/fortran90/lib/"}
-  : ${C_DEPEND='$(CPP) -M$@ $(CPPFLAGS)'}
-  : ${CXX_DEPEND='$(CPP) -M$@ $(CPPFLAGS)'}
+  : ${C_DEPEND='$(CPP) -M$@ $(CPPFLAGS) $(CFLAGS)'}
+  : ${CXX_DEPEND='$(CPP) -M$@ $(CPPFLAGS) $(CXXFLAGS)'}
   : ${F77_DEPEND='$(CPP) -M$@ $(CPPFLAGS)'}
   : ${C_DEPEND_OUT='> /dev/null'}
   : ${CXX_DEPEND_OUT='> /dev/null'}
diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux
index 29a36188..10c81acd 100644
--- a/lib/make/known-architectures/linux
+++ b/lib/make/known-architectures/linux
@@ -409,7 +409,7 @@ else
        icc_c99='-c99'
      fi
      : ${CFLAGS="$icc_opt $icc_c99"}
-     : ${C_DEPEND='$(CC) -M $(CPPFLAGS)'}
+     : ${C_DEPEND='$(CC) -M $(CPPFLAGS) $(CFLAGS)'}
      if test $icc_version -ge 8; then
        c_warn_flags='-Wall -w1 -Wcheck'
      else
@@ -486,7 +486,7 @@ else
        cxx_warn_flags='-Wall -w1'
      fi
      : ${CXX_WARN_FLAGS="$cxx_warn_flags"}
-     : ${CXX_DEPEND='$(CXX) -M $(CPPFLAGS)'}
+     : ${CXX_DEPEND='$(CXX) -M $(CPPFLAGS) $(CXXFLAGS)'}
      CXX_VERSION="`$CXX -V 2>&1 | grep -i version | head -n1`"
      : ${CXX_OPENMP_FLAGS='-openmp'}
      ;;
diff --git a/lib/make/known-architectures/osf b/lib/make/known-architectures/osf
index 0bd901d3..48737dee 100644
--- a/lib/make/known-architectures/osf
+++ b/lib/make/known-architectures/osf
@@ -32,7 +32,7 @@ else
 
   if test "$CC" = "cc" ; then
     if test "X$PTHREADS" = "Xyes" ; then
-      : ${C_DEPEND='$(CC) -pthread -E -M $(CPPFLAGS)'}
+      : ${C_DEPEND='$(CC) -pthread -E -M $(CPPFLAGS) $(CFLAGS)'}
     fi
     : ${CFLAGS="$STD_FLAGS"}
     : ${C_OPTIMISE_FLAGS='-O5 -fast -writable_strings'}
@@ -41,9 +41,9 @@ else
 
   if test "$CXX" = "cxx" ; then
     if test "X$PTHREADS" = "Xyes" ; then
-      : ${CXX_DEPEND='$(CXX) -pthread -noimplicit_include -E -M $(CPPFLAGS)'}
+      : ${CXX_DEPEND='$(CXX) -pthread -noimplicit_include -E -M $(CPPFLAGS) $(CXXFLAGS)'}
     else
-      : ${CXX_DEPEND='$(CXX) -noimplicit_include -E -M $(CPPFLAGS)'}
+      : ${CXX_DEPEND='$(CXX) -noimplicit_include -E -M $(CPPFLAGS) $(CXXFLAGS)'}
     fi
     : ${CXXFLAGS="$STD_FLAGS"}
     : ${CXX_OPTIMISE_FLAGS='-O5 -fast -writable_strings'}
diff --git a/lib/make/known-architectures/solaris b/lib/make/known-architectures/solaris
index dd86fedf..f4525847 100644
--- a/lib/make/known-architectures/solaris
+++ b/lib/make/known-architectures/solaris
@@ -37,13 +37,13 @@ else
   fi
 
 
-  : ${C_DEPEND='$(CPP) -M $(CPPFLAGS)'}
-  : ${CXX_DEPEND='$(CPP) -M $(CPPFLAGS)'}
+  : ${C_DEPEND='$(CPP) -M $(CPPFLAGS) $(CFLAGS)'}
+  : ${CXX_DEPEND='$(CPP) -M $(CPPFLAGS) $(CXXFLAGS)'}
 
   if test "`basename $CC`" = 'cc' ; then
     : ${C_OPTIMISE_FLAGS='-fast'}
   fi
-  if test "basename $CXX`" = 'CC' ; then
+  if test "`basename $CXX`" = 'CC' ; then
     : ${CXX_OPTIMISE_FLAGS='-fast'}
   fi
   : ${F90_OPTIMISE_FLAGS='-fast'}