diff --git a/Cantera/src/kinetics/Makefile.am b/Cantera/src/kinetics/Makefile.am index e01ff219b..10391752c 100644 --- a/Cantera/src/kinetics/Makefile.am +++ b/Cantera/src/kinetics/Makefile.am @@ -12,7 +12,6 @@ cc_sources = importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.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 AM_CXXFLAGS = $(AM_CPPFLAGS) diff --git a/Cantera/src/thermo/Makefile.am b/Cantera/src/thermo/Makefile.am index 8909eba4d..b22aefc48 100644 --- a/Cantera/src/thermo/Makefile.am +++ b/Cantera/src/thermo/Makefile.am @@ -15,7 +15,12 @@ h_sources = State.h Elements.h Constituents.h Phase.h mix_defs.h \ VPStandardStateTP.h PDSS_Water.h PDSS.h WaterProps.h \ WaterPropsIAPWSphi.h VPSSMgr_Water_HKFT.h PDSS_HKFT.h \ PDSS_IonsFromNeutral.h IonsFromNeutralVPSSTP.h \ - GibbsExcessVPSSTP.h + GibbsExcessVPSSTP.h LatticePhase.h IdealMolalSoln.h \ + PDSS.h HMWSoln.h WaterSSTP.h MetalSHEelectrons.h \ + VPSSMgr_Water_ConstVol.h VPSSMgr_Water_HKFT.h \ + IdealSolidSolnPhase.h StoichSubstanceSSTP.h \ + SingleSpeciesTP.h MineralEQ3.h PseudoBinaryVPSSTP.h \ + MargulesVPSSTP.cpp cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \ ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp \ @@ -30,46 +35,12 @@ cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \ WaterProps.cpp WaterPropsIAPWS.cpp WaterPropsIAPWSphi.cpp \ VPSSMgr_Water_HKFT.cpp VPSSMgr_Water_ConstVol.cpp \ PDSS_IonsFromNeutral.cpp IonsFromNeutralVPSSTP.cpp \ - GibbsExcessVPSSTP.cpp - -# semiconductorphase -# stoich substance -# pure fluid phase -# lattice solide phase -# lattice phase -# -# g++ -c VPStandardStateTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c IdealMolalSoln.cpp -O3 -Wall -fPIC -I../base -# g++ -c WaterPropsIAPWSphi.cpp -O3 -Wall -fPIC -I../base -# g++ -c WaterPropsIAPWS.cpp -O3 -Wall -fPIC -I../base -# g++ -c WaterProps.cpp -O3 -Wall -fPIC -I../base -# g++ -c PDSS.cpp -O3 -Wall -fPIC -I../base -# g++ -c PDSS_Water.cpp -O3 -Wall -fPIC -I../base -# g++ -c PDSS_HKFT.cpp -O3 -Wall -fPIC -I../base -# g++ -c HMWSoln.cpp -O3 -Wall -fPIC -I../base -# g++ -c HMWSoln_input.cpp -O3 -Wall -fPIC -I../base -# g++ -c DebyeHuckel.cpp -O3 -Wall -fPIC -I../base -# g++ -c WaterSSTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c MetalSHEelectrons.cpp -O3 -Wall -fPIC -I../base -# g++ -c VPSSMgr_Water_ConstVol.cpp -O3 -Wall -fPIC -I../base -# g++ -c VPSSMgr_Water_HKFT.cpp -O3 -Wall -fPIC -I../base -# g++ -c IdealSolidSolnPhase.cpp -O3 -Wall -fPIC -I../base -# g++ -c StoichSubstanceSSTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c SingleSpeciesTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c MineralEQ3.cpp -O3 -Wall -fPIC -I../base -# g++ -c GibbsExcessVPSSTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c PseudoBinaryVPSSTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c MargulesVPSSTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c IonsFromNeutralVPSSTP.cpp -O3 -Wall -fPIC -I../base -# g++ -c PDSS_IonsFromNeutral.cpp -O3 -Wall -fPIC -I../base - - - - PDSS_Water.cpp PDSS_HKFT.cpp \ - DebyeHuckel.cpp PDSS.cpp \ - WaterProps.cpp WaterPropsIAPWS.cpp WaterPropsIAPWSphi.cpp \ - VPSSMgr_Water_HKFT.cpp VPSSMgr_Water_ConstVol.cpp \ - PDSS_IonsFromNeutral.cpp + GibbsExcessVPSSTP.cpp LatticePhase.cpp IdealMolalSoln.cpp \ + HMWSoln.cpp HMWSoln_input.cpp WaterSSTP.cpp \ + MetalSHEelectrons.cpp VPSSMgr_Water_ConstVol.cpp \ + VPSSMgr_Water_HKFT.cpp IdealSolidSolnPhase.cpp \ + StoichSubstanceSSTP.cpp SingleSpeciesTP.cpp MineralEQ3.cpp \ + PseudoBinaryVPSSTP.cpp MargulesVPSSTP.cpp AM_CPPFLAGS = -I../base -I../../../ AM_CXXFLAGS = $(AM_CPPFLAGS) diff --git a/Makefile.am b/Makefile.am index 320ca5543..1097e3194 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,8 @@ include $(top_srcdir)/doxygen/aminclude.am # Build in these directories: SUBDIRS = Cantera ext test_problems -SUBDIRS += doxygen #examples +SUBDIRS += doxygen +#examples # Distribute these directories: DIST_SUBDIRS = Cantera examples diff --git a/configure.ac b/configure.ac index 5e74fba61..6d3a98b77 100644 --- a/configure.ac +++ b/configure.ac @@ -58,10 +58,12 @@ DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs) # examples/Makefile \ # examples/cxx/Makefile \ + AC_OUTPUT(Makefile \ test_problems/Makefile \ test_problems/cathermo/Makefile \ test_problems/cathermo/DH_graph_1/Makefile \ + test_problems/cathermo/DH_graph_acommon/Makefile \ doxygen/Makefile \ ext/Makefile \ ext/tpx/Makefile \ diff --git a/test_problems/cathermo/DH_graph_acommon/Makefile.am b/test_problems/cathermo/DH_graph_acommon/Makefile.am new file mode 100644 index 000000000..514cdd794 --- /dev/null +++ b/test_problems/cathermo/DH_graph_acommon/Makefile.am @@ -0,0 +1,20 @@ +cc_sources = DH_graph_1.cpp + +INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) + +LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo +LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode +LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ +AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/ +LIBS = $(LINK) + +bin_PROGRAMS = DH_graph_1 +library_includedir = $(INC) + +#----------------------- +# Cantera DH graph test +#----------------------- + +DH_graph_1_SOURCES = $(cc_sources) diff --git a/test_problems/cathermo/DH_graph_acommon/Makefile.in b/test_problems/cathermo/DH_graph_acommon/Makefile.in index de638c902..027cbe883 100644 --- a/test_problems/cathermo/DH_graph_acommon/Makefile.in +++ b/test_problems/cathermo/DH_graph_acommon/Makefile.in @@ -1,113 +1,562 @@ -#!/bin/sh +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ -############################################################################ -# -# Makefile to compile and link a C++ application to -# Cantera. -# -############################################################################# +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# addition to suffixes -.SUFFIXES : .d +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -# the name of the executable program to be created -PROG_NAME = DH_graph_1 +@SET_MAKE@ -# the object files to be linked together. List those generated from Fortran -# and from C/C++ separately -OBJS = DH_graph_1.o - - -# additional flags to be passed to the linker. If your program -# requires other external libraries, put them here -LINK_OPTIONS = @EXTRA_LINK@ - -############################################################################# - -# Check to see whether we are in the msvc++ environment -os_is_win = @OS_IS_WIN@ - -# Fortran libraries -ifeq (@build_with_f2c@, 0) -FORT_LIBS = @FLIBS@ -else -FORT_LIBS = -endif - -# the C++ compiler +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +bin_PROGRAMS = DH_graph_1$(EXEEXT) +subdir = test_problems/cathermo/DH_graph_acommon +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/common/ax_prog_doxygen.m4 \ + $(top_srcdir)/m4/common/ax_split_version.m4 \ + $(top_srcdir)/m4/config_summary.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" +PROGRAMS = $(bin_PROGRAMS) +am__objects_1 = DH_graph_1.$(OBJEXT) +am_DH_graph_1_OBJECTS = $(am__objects_1) +DH_graph_1_OBJECTS = $(am_DH_graph_1_OBJECTS) +DH_graph_1_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(DH_graph_1_SOURCES) +DIST_SOURCES = $(DH_graph_1_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +DX_CONFIG = @DX_CONFIG@ +DX_DOCDIR = @DX_DOCDIR@ +DX_DOT = @DX_DOT@ +DX_DOXYGEN = @DX_DOXYGEN@ +DX_DVIPS = @DX_DVIPS@ +DX_EGREP = @DX_EGREP@ +DX_ENV = @DX_ENV@ +DX_FLAG_chi = @DX_FLAG_chi@ +DX_FLAG_chm = @DX_FLAG_chm@ +DX_FLAG_doc = @DX_FLAG_doc@ +DX_FLAG_dot = @DX_FLAG_dot@ +DX_FLAG_html = @DX_FLAG_html@ +DX_FLAG_man = @DX_FLAG_man@ +DX_FLAG_pdf = @DX_FLAG_pdf@ +DX_FLAG_ps = @DX_FLAG_ps@ +DX_FLAG_rtf = @DX_FLAG_rtf@ +DX_FLAG_xml = @DX_FLAG_xml@ +DX_HHC = @DX_HHC@ +DX_LATEX = @DX_LATEX@ +DX_MAKEINDEX = @DX_MAKEINDEX@ +DX_PDFLATEX = @DX_PDFLATEX@ +DX_PERL = @DX_PERL@ +DX_PROJECT = @DX_PROJECT@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FC = @FC@ +FCFLAGS = @FCFLAGS@ +FFLAGS = @FFLAGS@ +FGREP = @FGREP@ +GENERIC_MAJOR_VERSION = @GENERIC_MAJOR_VERSION@ +GENERIC_MICRO_VERSION = @GENERIC_MICRO_VERSION@ +GENERIC_MINOR_VERSION = @GENERIC_MINOR_VERSION@ +GENERIC_RELEASE = @GENERIC_RELEASE@ +GENERIC_VERSION = @GENERIC_VERSION@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = $(LINK) +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_DESCRIPTION = @PACKAGE_DESCRIPTION@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_FC = @ac_ct_FC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +cc_sources = DH_graph_1.cpp +INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel +AM_CPPFLAGS = $(INC) +AM_CXXFLAGS = $(AM_CPPFLAGS) +LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport \ + -lthermo -lctnumerics -lctmath -ltpx -lctspectra -lconverters \ + -lctbase -lcvode -lctlapack -lctblas -lctf2c -lm -lstdc++ +AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/ +library_includedir = $(INC) -# C++ compile flags -CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ +#----------------------- +# Cantera DH graph test +#----------------------- +DH_graph_1_SOURCES = $(cc_sources) +all: all-am -# Ending C++ linking libraries -LCXX_END_LIBS = @LCXX_END_LIBS@ +.SUFFIXES: +.SUFFIXES: .cpp .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test_problems/cathermo/DH_graph_acommon/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu test_problems/cathermo/DH_graph_acommon/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; -# the directory where the Cantera libraries are located -CANTERA_LIBDIR=@buildlib@ +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -# Dependencies for CANTERA_LIBS -CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done -# required Cantera libraries -CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files -# the directory where Cantera include files may be found. -CANTERA_INCDIR=@ctroot@/build/include/cantera -INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +DH_graph_1$(EXEEXT): $(DH_graph_1_OBJECTS) $(DH_graph_1_DEPENDENCIES) + @rm -f DH_graph_1$(EXEEXT) + $(CXXLINK) $(DH_graph_1_OBJECTS) $(DH_graph_1_LDADD) $(LIBS) -# flags passed to the C++ compiler/linker for the linking step -LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ +mostlyclean-compile: + -rm -f *.$(OBJEXT) -# How to compile C++ source files to object files -.@CXX_EXT@.@OBJ_EXT@: - $(CXX) -c $< $(INCLUDES) $(CXX_FLAGS) +distclean-compile: + -rm -f *.tab.c -# How to compile the dependency file -.cpp.d: - @CXX_DEPENDS@ $(INCLUDES) $(CXX_FLAGS) $*.cpp > $*.d +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DH_graph_1.Po@am__quote@ -# List of dependency files to be created -DEPENDS=$(OBJS:.o=.d) +.cpp.o: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -# Program Name -PROGRAM = $(PROG_NAME)$(EXE_EXT) +.cpp.obj: +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -all: $(PROGRAM) .depends +.cpp.lo: +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -$(PROGRAM): $(OBJS) $(CANTERA_LIBS_DEP) - $(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \ - $(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \ - $(LCXX_END_LIBS) +mostlyclean-libtool: + -rm -f *.lo -# Add an additional target for stability: -$(OBJS): $(CANTERA_LIBDIR)/libctbase.a $(CANTERA_LIBDIR)/libthermo.a +clean-libtool: + -rm -rf .libs _libs -# depends target -> forces recalculation of dependencies -depends: - @MAKE@ .depends +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS -.depends: $(DEPENDS) - cat $(DEPENDS) > .depends +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique -# Do the test -> For the windows vc++ environment, we have to skip checking on -# whether the program is uptodate, because we don't utilize make -# in that environment to build programs. -test: -ifeq ($(os_is_win), 1) -else - @ @MAKE@ -s $(PROGRAM) -endif - @ ./runtest +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" -clean: - $(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends - ../../../bin/rm_cvsignore - (if test -d SunWS_cache ; then \ - $(RM) -rf SunWS_cache ; \ - fi ) +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -ifeq ($(wildcard .depends), .depends) -include .depends -endif +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-binPROGRAMS + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/test_problems/cathermo/Makefile.am b/test_problems/cathermo/Makefile.am index 64989c8cc..d9611d780 100644 --- a/test_problems/cathermo/Makefile.am +++ b/test_problems/cathermo/Makefile.am @@ -1 +1 @@ -SUBDIRS = DH_graph_1 \ No newline at end of file +SUBDIRS = DH_graph_1 DH_graph_acommon \ No newline at end of file