From d8bb6b7fd256613ec6409487475ff07c45d1f2b7 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Mon, 29 Oct 2007 23:50:09 +0000
Subject: [PATCH] Fixed a couple of errors in the Makefiles. Special cased
 lapack and blas, and took out a recursive variable defn.

---
 test_problems/CpJump/Makefile.in            | 20 +++++++++++++++++++-
 test_problems/multiGasTransport/Makefile.in |  7 +++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/test_problems/CpJump/Makefile.in b/test_problems/CpJump/Makefile.in
index 4e044efc4..7cad3c45c 100644
--- a/test_problems/CpJump/Makefile.in
+++ b/test_problems/CpJump/Makefile.in
@@ -52,6 +52,24 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Cantera library Dependencies
+CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/liboneD.a \
+                   $(CANTERA_LIBDIR)/libzeroD.a \
+                   $(CANTERA_LIBDIR)/libkinetics.a \
+                   $(CANTERA_LIBDIR)/libtransport.a \
+                   $(CANTERA_LIBDIR)/libthermo.a \
+                   $(CANTERA_LIBDIR)/libctnumerics.a \
+                   $(CANTERA_LIBDIR)/libcvode.a \
+                   $(CANTERA_LIBDIR)/libctbase.a \
+                   $(CANTERA_LIBDIR)/libctmath.a \
+                   $(CANTERA_LIBDIR)/libtpx.a \
+                   $(CANTERA_LIBDIR)/libconverters.a
+
+ifeq (@build_lapack@, 1)
+CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \
+                      $(CANTERA_LIBDIR)/libctlapack.a
+endif
+
 # the directory where Cantera include files may be found.
 ifeq ($(src_dir_tree), 1)
 CANTERA_INCDIR=../../Cantera/src
@@ -78,7 +96,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM)
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/multiGasTransport/Makefile.in b/test_problems/multiGasTransport/Makefile.in
index 1ae95fb82..093ce5dc8 100644
--- a/test_problems/multiGasTransport/Makefile.in
+++ b/test_problems/multiGasTransport/Makefile.in
@@ -66,9 +66,8 @@ CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/liboneD.a \
                    $(CANTERA_LIBDIR)/libconverters.a 
 
 ifeq (@build_lapack@, 1)
-CANTERA_LIB_DEPS = $CANTERA_LIB_DEPS \
-                   $(CANTERA_LIBDIR)/libctblas.a \
-                   $(CANTERA_LIBDIR)/libctlapack.a
+CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \
+                      $(CANTERA_LIBDIR)/libctlapack.a
 endif
 
 # the directory where Cantera include files may be found.
@@ -99,7 +98,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 all: $(PROGRAM)
 
 # Rule to make the program
-$(PROGRAM): $(OBJS)  $(CANTERA_LIB_DEPS)
+$(PROGRAM): $(OBJS)  $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)