From 4a807128466efb95447213bde6032ebc2d8bf6bd Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Mon, 18 Jun 2012 15:14:58 +0000 Subject: [PATCH] [cantera2.0]: more makefile.am fixes--very close to compiling regression tests, now --- configure.ac | 14 +++++++------- src/base/Makefile.am | 2 +- test_problems/cathermo/DH_graph_1/Makefile.am | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index cec4125fa..9f85148a4 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,13 @@ DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs) # Generate Output Files AC_OUTPUT(Makefile \ + ext/Makefile \ + ext/libexecstream/Makefile \ + ext/f2c_math/Makefile \ + ext/f2c_libs/Makefile \ + ext/f2c_blas/Makefile \ + ext/f2c_lapack/Makefile \ + ext/cvode/Makefile \ test_problems/Makefile \ test_problems/mixGasTransport/Makefile \ test_problems/ChemEquil_gri_matrix/Makefile \ @@ -148,12 +155,6 @@ AC_OUTPUT(Makefile \ src/transport/Makefile \ src/spectra/Makefile src/zeroD/Makefile \ src/equil/Makefile \ - ext/Makefile \ - ext/f2c_libs/Makefile \ - ext/f2c_blas/Makefile \ - ext/f2c_lapack/Makefile \ - ext/libexecstream/Makefile \ - ext/cvode/Makefile \ cantera.pc) # skipped tests @@ -161,7 +162,6 @@ AC_OUTPUT(Makefile \ # test_problems/nasa9_reader/Makefile # test_problems/rankine_democxx/Makefile # test_problems/VCSnonideal/NaCl_equil/Makefile -# ext/f2c_math/Makefile \ # FINAL SUMMARY AX_SUMMARIZE_CONFIG diff --git a/src/base/Makefile.am b/src/base/Makefile.am index 93ef007ed..511e030a0 100644 --- a/src/base/Makefile.am +++ b/src/base/Makefile.am @@ -7,7 +7,7 @@ cc_sources = ct2ctml.cpp ctml.cpp plots.cpp \ global.cpp AM_LDFLAGS = -L$(top_builddir)/build/lib/ -LIBS = -lexecstream +LIBS = -L$(top_builddir)/build/lib/ -lexecstream AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/ext/libexecstream AM_CXXFLAGS = $(AM_CPPFLAGS) diff --git a/test_problems/cathermo/DH_graph_1/Makefile.am b/test_problems/cathermo/DH_graph_1/Makefile.am index 915d64b02..973cb2405 100644 --- a/test_problems/cathermo/DH_graph_1/Makefile.am +++ b/test_problems/cathermo/DH_graph_1/Makefile.am @@ -3,8 +3,8 @@ INC += -I$(top_builddir)/ext/libexecstream AM_CPPFLAGS = $(INC) AM_CXXFLAGS = $(AM_CPPFLAGS) -LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo -LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK = -lctmath -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -ltpx -lctspectra -lconverters -lctbase -lcvode LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ -lexecstream #-lctcxx -luser AM_LDFLAGS = -L$(top_builddir)/build/lib/