research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[cantera2.0]: updating makefile.am, still more work on libexec to be done

Browse source
This commit is contained in:
Nicholas Malaya 2012-06-18 04:46:51 +00:00
parent ece7e870b6
commit d5432c4f8d
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -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)

2
ext/Makefile.am
View file

@ -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:

7
src/base/Makefile.am
View file

@ -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

3
test_problems/cathermo/DH_graph_1/Makefile.am
View file

@ -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)