From 5efce48bcaf9dccd289e946e80b53da6aa2b28b2 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Wed, 1 Feb 2012 21:14:09 +0000 Subject: [PATCH] [cantera]: fixing build that was broken in previous update, continuing with transport model additions --- Cantera/src/kinetics/Makefile.am | 12 +++++++----- ext/f2c_libs/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Cantera/src/kinetics/Makefile.am b/Cantera/src/kinetics/Makefile.am index 40f8196aa..e01ff219b 100644 --- a/Cantera/src/kinetics/Makefile.am +++ b/Cantera/src/kinetics/Makefile.am @@ -3,12 +3,14 @@ h_sources = importKinetics.h GRI_30_Kinetics.h KineticsFactory.h \ FalloffFactory.h ReactionStoichMgr.h reaction_defs.h \ FalloffMgr.h ThirdBodyMgr.h RateCoeffMgr.h ReactionData.h \ RxnRates.h Enhanced3BConc.h StoichManager.h solveSP.h \ - AqueousKinetics.h InterfaceKinetics.h ImplicitSurfChem.h + AqueousKinetics.h InterfaceKinetics.h ImplicitSurfChem.h \ + Group.h -cc_sources = importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp \ - GasKinetics.cpp AqueousKinetics.cpp FalloffFactory.cpp \ - ReactionStoichMgr.cpp Kinetics.cpp solveSP.cpp \ - ReactionPath.cpp InterfaceKinetics.cpp ImplicitSurfChem.cpp +cc_sources = importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp \ + GasKinetics.cpp AqueousKinetics.cpp FalloffFactory.cpp \ + ReactionStoichMgr.cpp Kinetics.cpp solveSP.cpp \ + ReactionPath.cpp InterfaceKinetics.cpp ImplicitSurfChem.cpp \ + Group.cpp #AM_CPPFLAGS = -I../base -I../thermo -I../../../ AM_CPPFLAGS = -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel diff --git a/ext/f2c_libs/Makefile.am b/ext/f2c_libs/Makefile.am index 3f70e5f0d..7ddd26e27 100644 --- a/ext/f2c_libs/Makefile.am +++ b/ext/f2c_libs/Makefile.am @@ -49,6 +49,6 @@ library_include_HEADERS = $(h_sources) #----------------------- __top_builddir__build_lib_libctf2c_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) -__top_builddir__build_lib_libctf2c_la_SOURCES = $(fc_sources) $(cc_sources) +__top_builddir__build_lib_libctf2c_la_SOURCES = $(cc_sources) $(h_sources) CLEANFILES = *.o