diff --git a/test_problems/cathermo/DH_graph_1/Makefile.in b/test_problems/cathermo/DH_graph_1/Makefile.in
index 07e6dbf47..0cfc4d76a 100644
--- a/test_problems/cathermo/DH_graph_1/Makefile.in
+++ b/test_problems/cathermo/DH_graph_1/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -72,8 +75,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a .depends
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/DH_graph_NM/Makefile.in b/test_problems/cathermo/DH_graph_NM/Makefile.in
index 428d8db3f..0029fed70 100644
--- a/test_problems/cathermo/DH_graph_NM/Makefile.in
+++ b/test_problems/cathermo/DH_graph_NM/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a .depends
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/DH_graph_Pitzer/Makefile.in b/test_problems/cathermo/DH_graph_Pitzer/Makefile.in
index da0256da9..4069da854 100644
--- a/test_problems/cathermo/DH_graph_Pitzer/Makefile.in
+++ b/test_problems/cathermo/DH_graph_Pitzer/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a .depends
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/DH_graph_acommon/Makefile.in b/test_problems/cathermo/DH_graph_acommon/Makefile.in
index ef0f292f4..2f5f6264e 100644
--- a/test_problems/cathermo/DH_graph_acommon/Makefile.in
+++ b/test_problems/cathermo/DH_graph_acommon/Makefile.in
@@ -46,6 +46,9 @@ LCXX_END_LIBS = @LCXX_END_LIBS@
 # the directory where the Cantera libraries are located
 CANTERA_LIBDIR=@buildlib@
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
@@ -72,8 +75,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a .depends
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/DH_graph_bdotak/Makefile.in b/test_problems/cathermo/DH_graph_bdotak/Makefile.in
index 88bea3f85..bee9ee383 100644
--- a/test_problems/cathermo/DH_graph_bdotak/Makefile.in
+++ b/test_problems/cathermo/DH_graph_bdotak/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a .depends
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_dupl_test/Makefile.in b/test_problems/cathermo/HMW_dupl_test/Makefile.in
index 3f2ae078d..f1067e883 100644
--- a/test_problems/cathermo/HMW_dupl_test/Makefile.in
+++ b/test_problems/cathermo/HMW_dupl_test/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in
index 7f522e6b5..7330b6c56 100644
--- a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends Cp_standalone
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_graph_GvI/Makefile.in b/test_problems/cathermo/HMW_graph_GvI/Makefile.in
index 52bb634c6..0219a6aa3 100644
--- a/test_problems/cathermo/HMW_graph_GvI/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_GvI/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_graph_GvT/Makefile.in b/test_problems/cathermo/HMW_graph_GvT/Makefile.in
index 2576705e4..0127086c1 100644
--- a/test_problems/cathermo/HMW_graph_GvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_GvT/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends Gex_standalone
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.in b/test_problems/cathermo/HMW_graph_HvT/Makefile.in
index 5be910e02..ca7015cdf 100644
--- a/test_problems/cathermo/HMW_graph_HvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends L_standalone
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.in b/test_problems/cathermo/HMW_graph_VvT/Makefile.in
index fbaaf2390..f87503489 100644
--- a/test_problems/cathermo/HMW_graph_VvT/Makefile.in
+++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends V_standalone
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_test_1/Makefile.in b/test_problems/cathermo/HMW_test_1/Makefile.in
index d1d4a1d1a..d0096346e 100644
--- a/test_problems/cathermo/HMW_test_1/Makefile.in
+++ b/test_problems/cathermo/HMW_test_1/Makefile.in
@@ -56,6 +56,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -79,8 +82,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/HMW_test_3/Makefile.in b/test_problems/cathermo/HMW_test_3/Makefile.in
index 33ac70878..a535d3067 100644
--- a/test_problems/cathermo/HMW_test_3/Makefile.in
+++ b/test_problems/cathermo/HMW_test_3/Makefile.in
@@ -55,6 +55,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -78,8 +81,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: .depends $(PROGRAM) 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/ims/Makefile.in b/test_problems/cathermo/ims/Makefile.in
index 2e94aa795..a20f94651 100644
--- a/test_problems/cathermo/ims/Makefile.in
+++ b/test_problems/cathermo/ims/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/issp/Makefile.in b/test_problems/cathermo/issp/Makefile.in
index 3841e4e05..00626023a 100644
--- a/test_problems/cathermo/issp/Makefile.in
+++ b/test_problems/cathermo/issp/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,7 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/stoichSubSSTP/Makefile.in b/test_problems/cathermo/stoichSubSSTP/Makefile.in
index 8e0af910c..7b733c665 100644
--- a/test_problems/cathermo/stoichSubSSTP/Makefile.in
+++ b/test_problems/cathermo/stoichSubSSTP/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends 
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/testIAPWS/Makefile.in b/test_problems/cathermo/testIAPWS/Makefile.in
index aad9c8fd0..f42a74968 100755
--- a/test_problems/cathermo/testIAPWS/Makefile.in
+++ b/test_problems/cathermo/testIAPWS/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/testIAPWSPres/Makefile.in b/test_problems/cathermo/testIAPWSPres/Makefile.in
index f2983bc19..613bb908b 100755
--- a/test_problems/cathermo/testIAPWSPres/Makefile.in
+++ b/test_problems/cathermo/testIAPWSPres/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/testIAPWSTripP/Makefile.in b/test_problems/cathermo/testIAPWSTripP/Makefile.in
index 97b9f0dda..0864132e3 100755
--- a/test_problems/cathermo/testIAPWSTripP/Makefile.in
+++ b/test_problems/cathermo/testIAPWSTripP/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/testWaterPDSS/Makefile.in b/test_problems/cathermo/testWaterPDSS/Makefile.in
index 21758fd7a..dd68816ac 100755
--- a/test_problems/cathermo/testWaterPDSS/Makefile.in
+++ b/test_problems/cathermo/testWaterPDSS/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/cathermo/testWaterTP/Makefile.in b/test_problems/cathermo/testWaterTP/Makefile.in
index c58e63bb5..685de3f4b 100644
--- a/test_problems/cathermo/testWaterTP/Makefile.in
+++ b/test_problems/cathermo/testWaterTP/Makefile.in
@@ -48,6 +48,9 @@ CANTERA_LIBDIR=@buildlib@
 # required Cantera libraries
 CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
 
+# Dependencies for CANTERA_LIBS
+CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
+
 # the directory where Cantera include files may be found.
 CANTERA_INCDIR=@ctroot@/build/include/cantera
 INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel
@@ -71,8 +74,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM) .depends
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a \
-	     $(CANTERA_LIBDIR)/libthermo.a
+$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)