diff --git a/configure.ac b/configure.ac index 7f78afcad..cec4125fa 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,7 @@ AC_OUTPUT(Makefile \ ext/f2c_libs/Makefile \ ext/f2c_blas/Makefile \ ext/f2c_lapack/Makefile \ + ext/libexecstream/Makefile \ ext/cvode/Makefile \ cantera.pc) diff --git a/ext/Makefile.am b/ext/Makefile.am index d415865f8..663468361 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = f2c_libs f2c_blas f2c_lapack cvode +SUBDIRS = f2c_libs f2c_blas f2c_lapack cvode libexecstream # header file accumulation all: diff --git a/src/base/Makefile.am b/src/base/Makefile.am index 463ea07c8..93ef007ed 100644 --- a/src/base/Makefile.am +++ b/src/base/Makefile.am @@ -1,4 +1,4 @@ -h_sources = LogPrintCtrl.h +h_sources = LogPrintCtrl.h application.h units.h cc_sources = ct2ctml.cpp ctml.cpp plots.cpp \ stringUtils.cpp xml.cpp clockWC.cpp \ @@ -6,7 +6,10 @@ cc_sources = ct2ctml.cpp ctml.cpp plots.cpp \ checkFinite.cpp application.cpp ctexceptions.cpp \ global.cpp -AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include +AM_LDFLAGS = -L$(top_builddir)/build/lib/ +LIBS = -lexecstream + +AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/ext/libexecstream AM_CXXFLAGS = $(AM_CPPFLAGS) lib_LTLIBRARIES = $(top_builddir)/build/lib/libctbase.la diff --git a/test_problems/cathermo/DH_graph_1/Makefile.am b/test_problems/cathermo/DH_graph_1/Makefile.am index 3fc9c69bd..915d64b02 100644 --- a/test_problems/cathermo/DH_graph_1/Makefile.am +++ b/test_problems/cathermo/DH_graph_1/Makefile.am @@ -1,10 +1,11 @@ INC = -I. -I$(top_builddir)/include -I$(top_builddir)/test_problems/shared +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 += -lctlapack -lctblas -lctf2c -lm -lstdc++ +LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ -lexecstream #-lctcxx -luser AM_LDFLAGS = -L$(top_builddir)/build/lib/ LIBS = $(LINK)