diff --git a/examples/cxx/Makefile.in b/examples/cxx/Makefile.in
index 3d68a674c..8d92d06a6 100755
--- a/examples/cxx/Makefile.in
+++ b/examples/cxx/Makefile.in
@@ -60,12 +60,21 @@ CANTERA_LIB_DEPS = $(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
+
+ifeq (@use_sundials@, 0)
+CANTERA_CVODE_DEPS = $(CANTERA_LIBDIR)/libcvode.a
+endif
+
+LIB_DEPS = $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS) $(CANTERA_CVODE_DEPS)
 
 # the directory where Cantera include files may be found.
 CANTERA_INC=-I@ctroot@/build/include
@@ -90,7 +99,7 @@ DEPENDS=$(OBJS:.o=.d)
 %.d:
 	@CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $*.cpp > $*.d
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS)
+$(PROGRAM): $(OBJS) $(LIB_DEPS)
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(CANTERA_LIBS) \
                    $(LINK_OPTIONS) $(EXT_LIBS) @LIBS@ \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/CpJump/Makefile.in b/test_problems/CpJump/Makefile.in
index 7cad3c45c..8a313cb7f 100644
--- a/test_problems/CpJump/Makefile.in
+++ b/test_problems/CpJump/Makefile.in
@@ -59,7 +59,6 @@ CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/liboneD.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 \
@@ -70,6 +69,12 @@ CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \
                       $(CANTERA_LIBDIR)/libctlapack.a
 endif
 
+ifeq (@use_sundials@, 0)
+CANTERA_CVODE_DEPS = $(CANTERA_LIBDIR)/libcvode.a
+endif
+
+LIB_DEPS = $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS) $(CANTERA_CVODE_DEPS)
+
 # the directory where Cantera include files may be found.
 ifeq ($(src_dir_tree), 1)
 CANTERA_INCDIR=../../Cantera/src
@@ -96,7 +101,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
 
 all: $(PROGRAM)
 
-$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS)
+$(PROGRAM): $(OBJS) $(LIB_DEPS) 
 	$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
                   $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
                   $(LCXX_END_LIBS)
diff --git a/test_problems/surfSolverTest/Makefile.in b/test_problems/surfSolverTest/Makefile.in
index da8cb5436..2e0236f7f 100644
--- a/test_problems/surfSolverTest/Makefile.in
+++ b/test_problems/surfSolverTest/Makefile.in
@@ -50,7 +50,6 @@ LCXX_END_LIBS = @LCXX_END_LIBS@
 CANTERA_LIBDIR=@buildlib@
 
 CANTERA_LIB_DEP=$(CANTERA_LIBDIR)/libctbase.a \
-                $(CANTERA_LIBDIR)/libcvode.a \
                 $(CANTERA_LIBDIR)/libctnumerics.a \
                 $(CANTERA_LIBDIR)/libthermo.a \
                 $(CANTERA_LIBDIR)/libtransport.a \