From 22f0e3317e8fe5c007b9f7d82598e7c01c18332b Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Thu, 9 Feb 2012 21:09:19 +0000 Subject: [PATCH] [cantera]: moving include files to a more sane directory for cxx --- Cantera/cxx/include/.cvsignore | 4 - Cantera/cxx/include/CMakeLists.txt | 8 - Cantera/cxx/include/Cantera.mak.in | 150 ------------------ Cantera/cxx/include/Cantera_bt.mak.in | 137 ---------------- Cantera/cxx/{include => src}/Cantera.h | 0 Cantera/cxx/{include => src}/Edge.h | 0 Cantera/cxx/{include => src}/GRI30.h | 0 Cantera/cxx/{include => src}/IdealGasMix.h | 0 .../{include => src}/IncompressibleSolid.h | 0 Cantera/cxx/{include => src}/Interface.h | 0 Cantera/cxx/src/Makefile.am | 2 +- Cantera/cxx/{include => src}/Metal.h | 0 Cantera/cxx/{include => src}/PureFluid.h | 0 .../cxx/{include => src}/electrolyteThermo.h | 0 Cantera/cxx/{include => src}/equilibrium.h | 0 Cantera/cxx/{include => src}/importPhase.h | 0 Cantera/cxx/{include => src}/integrators.h | 0 Cantera/cxx/{include => src}/kinetics.h | 0 Cantera/cxx/{include => src}/numerics.h | 0 Cantera/cxx/{include => src}/onedim.h | 0 Cantera/cxx/{include => src}/radiation.h | 0 Cantera/cxx/{include => src}/reactionpaths.h | 0 Cantera/cxx/{include => src}/spectra.h | 0 Cantera/cxx/{include => src}/surface.h | 0 Cantera/cxx/{include => src}/thermo.h | 0 Cantera/cxx/{include => src}/transport.h | 0 Cantera/cxx/{include => src}/zerodim.h | 0 27 files changed, 1 insertion(+), 300 deletions(-) delete mode 100644 Cantera/cxx/include/.cvsignore delete mode 100644 Cantera/cxx/include/CMakeLists.txt delete mode 100644 Cantera/cxx/include/Cantera.mak.in delete mode 100644 Cantera/cxx/include/Cantera_bt.mak.in rename Cantera/cxx/{include => src}/Cantera.h (100%) rename Cantera/cxx/{include => src}/Edge.h (100%) rename Cantera/cxx/{include => src}/GRI30.h (100%) rename Cantera/cxx/{include => src}/IdealGasMix.h (100%) rename Cantera/cxx/{include => src}/IncompressibleSolid.h (100%) rename Cantera/cxx/{include => src}/Interface.h (100%) rename Cantera/cxx/{include => src}/Metal.h (100%) rename Cantera/cxx/{include => src}/PureFluid.h (100%) rename Cantera/cxx/{include => src}/electrolyteThermo.h (100%) rename Cantera/cxx/{include => src}/equilibrium.h (100%) rename Cantera/cxx/{include => src}/importPhase.h (100%) rename Cantera/cxx/{include => src}/integrators.h (100%) rename Cantera/cxx/{include => src}/kinetics.h (100%) rename Cantera/cxx/{include => src}/numerics.h (100%) rename Cantera/cxx/{include => src}/onedim.h (100%) rename Cantera/cxx/{include => src}/radiation.h (100%) rename Cantera/cxx/{include => src}/reactionpaths.h (100%) rename Cantera/cxx/{include => src}/spectra.h (100%) rename Cantera/cxx/{include => src}/surface.h (100%) rename Cantera/cxx/{include => src}/thermo.h (100%) rename Cantera/cxx/{include => src}/transport.h (100%) rename Cantera/cxx/{include => src}/zerodim.h (100%) diff --git a/Cantera/cxx/include/.cvsignore b/Cantera/cxx/include/.cvsignore deleted file mode 100644 index 867b46681..000000000 --- a/Cantera/cxx/include/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -Cantera_bt.mak -Cantera.mak -CMakeFiles -cmake_install.cmake diff --git a/Cantera/cxx/include/CMakeLists.txt b/Cantera/cxx/include/CMakeLists.txt deleted file mode 100644 index c073b848f..000000000 --- a/Cantera/cxx/include/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -SET(CXX_H Cantera.h equilibrium.h IncompressibleSolid.h - kinetics.h onedim.h surface.h GRI30.h integrators.h - Metal.h PureFluid.h transport.h Edge.h - IdealGasMix.h Interface.h numerics.h - reactionpaths.h zerodim.h importPhase.h thermo.h - radiation.h spectra.h) - -INSTALL_FILES(/include/cantera FILES ${CXX_H}) diff --git a/Cantera/cxx/include/Cantera.mak.in b/Cantera/cxx/include/Cantera.mak.in deleted file mode 100644 index 29d63639f..000000000 --- a/Cantera/cxx/include/Cantera.mak.in +++ /dev/null @@ -1,150 +0,0 @@ -####################################################################### -# Include Snipet for Makefiles -# -# To create Cantera C++ applications from the install environment -# include this file into your Makefile environment -# -# Main Variables: -# -# CANTERA_INCLUDES = Variable containing the include path -# -# -# CANTERA_LIBS = List of libraries to include on the link line -# -# CANTERA_LIBS_DEP = dependency line for Cantera libs -# -# -##################################################################### -# $Id: Cantera.mak.in,v 1.5 2009/01/09 23:26:41 hkmoffa Exp $ -# -# -# This variable determines whether we are making this example in the -# build tree environment or in the install tree environment. -# -in_CanteraBuildTree = 0 - -CANTERA_VERSION=@ctversion@ - -############################################################################### -# CANTERA CORE -############################################################################### -# -# The directory where Cantera include files may be found. -# Include files in application programs should start with: -# #include "cantera/thermo.h" -# #include "cantera/kernel/HMWSoln.h" -# -CANTERA_INCROOTDIR= @ct_incroot@ - -CANTERA_CORE_INCLUDES=-I$(CANTERA_INCROOTDIR) -# -# Library location -# -CANTERA_LIBSDIR= @ct_libdir@ - -# -# Required Cantera libraries -# -CANTERA_CORE_LIBS= -L$(CANTERA_LIBSDIR) @CANTERA_CORE_LIBS@ -lctcxx - -# -# Cantera Core Lib Dependencies -# -CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBSDIR)/libctcxx.a - -##################################################################### -# BOOST -#################################################################### -# -# Cantera Boost Include -# -CANTERA_BOOST_INCLUDES=@BOOST_INCLUDE@ -# -# Location of the boost library that Cantera linked against -# -CANTERA_BOOST_LIB_DIR=@BOOST_LIB_DIR@ -# -# Linkage extras for linking against boost -# -ifeq ("x$(CANTERA_BOOST_LIB_DIR)","x") -CANTERA_BOOST_LIBS= -else -CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@ -endif - -##################################################################### -# CVODE/SUNDIALS LINKAGE -#################################################################### -# -CANTERA_use_sundials = @use_sundials@ -# -# Includes for Sundials - none for cvode -# -CANTERA_CVODE_INCLUDE=@sundials_include@ -CANTERA_SUNDIALS_LIB_DIR=@sundials_lib_dir@ -# -# Link line for cvode and sundials -# -ifeq ($(CANTERA_use_sundials), 1) -CANTERA_CVODE_LIBS=-L$(CANTERA_SUNDIALS_LIB_DIR) @CVODE_LIBS@ -CANTERA_CVODE_LIBS_DEP=@sundials_lib_dep@ -else -CANTERA_CVODE_LIBS= -L$(CANTERA_LIBSDIR) -lcvode -CANTERA_CVODE_LIBS_DEP=$(CANTERA_LIBSDIR)/libcvode.a -endif -# -####################################################################### -# BLAS LAPACK LINKAGE -####################################################################### -# -CANTERA_build_lapack= @build_lapack@ -CANTERA_build_blas= @build_blas@ - -CANTERA_BLAS_LAPACK_DIR= @ct_libdir@ - -CANTERA_BLAS_LAPACK_LIBS = -L$(CANTERA_BLAS_LAPACK_DIR) @BLAS_LAPACK_LIBS@ -CANTERA_BLAS_LAPACK_LIBS_DEP= -# -####################################################################### -# CANTERA's F2C Linkage -####################################################################### -# -CANTERA_build_with_f2c= @build_with_f2c@ -CANTERA_build_f2c_lib= @build_f2c_lib@ - -ifeq ($(CANTERA_build_f2c_lib), 1) -CANTERA_F2C_LIBS= -L$(CANTERA_LIBSDIR) -lctf2c -else -CANTERA_F2C_LIBS= @F2C_SYSTEMLIB@ -endif -# -##################################################################### -# COMBINATIONS OF INCLUDES AND LIBS -#################################################################### -# -CANTERA_TOTAL_INCLUDES= $(CANTERA_CORE_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE) -# -# You can add this into the compilation environment to identify the version number -# -CANTERA_DEFINES = -DCANTERA_VERSION=@ctversion@ -# -# LIBS and LIBS should be the same ... -# -CANTERA_TOTAL_LIBS2 = -L$(CANTERA_LIBSDIR) @LOCAL_LIBS@ -# -CANTERA_TOTAL_LIBS= $(CANTERA_CORE_LIBS) $(CANTERA_BOOST_LIBS) \ - $(CANTERA_CVODE_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \ - $(CANTERA_F2C_LIBS) -# -CANTERA_TOTAL_LIBS_DEP= $(CANTERA_CORE_LIBS_DEP) \ - $(CANTERA_CVODE_LIBS_DEP) \ - $(CANTERA_BLAS_LAPACK_LIBS_DEP) -# -# -# Dependency Line -# -CANTERA_LIBS_DEP= @INSTALL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a -# -##################################################################### -# END -#################################################################### diff --git a/Cantera/cxx/include/Cantera_bt.mak.in b/Cantera/cxx/include/Cantera_bt.mak.in deleted file mode 100644 index b98df72c3..000000000 --- a/Cantera/cxx/include/Cantera_bt.mak.in +++ /dev/null @@ -1,137 +0,0 @@ -####################################################################### -# Include Snipet for Makefiles -# -# To create Cantera C++ applications from the build tree environment -# include this file into your Makefile environment -# -# Main Variables: -# -# CANTERA_INCLUDES = Variable containing the include path -# -# -# CANTERA_LIBS = List of libraries to include on the link line -# -# CANTERA_LIBS_DEP = dependency line for Cantera libs -# -# -##################################################################### -# $Id: Cantera_bt.mak.in,v 1.2 2008/01/21 21:17:52 hkmoffa Exp $ -# -# -# This variable determines whether we are making this example in the -# build tree environment or in the install tree environment. -# -in_CanteraBuildTree = 0 - -CANTERA_VERSION=@ctversion@ - -############################################################################### -# CANTERA CORE -############################################################################### -# -# The directory where Cantera include files may be found. -# Include files in application programs should start with: -# #include "cantera/thermo.h" -# #include "cantera/kernel/HMWSoln.h" -# -CANTERA_INCROOTDIR= @ct_incroot@ - -CANTERA_CORE_INCLUDES=-I$(CANTERA_INCROOTDIR) -# -# Library location -# -CANTERA_LIBSDIR= @ct_libdir@ - -# -# Required Cantera libraries -# -CANTERA_CORE_LIBS= -L$(CANTERA_LIBSDIR) @CANTERA_CORE_LIBS@ -lctcxx - -# -# Cantera Core Lib Dependencies -# -CANTERA_CORE_LIBS_DEP= @CANTERA_CORE_LIBS_DEP@ $(CANTERA_LIBSDIR)/libctcxx.a - -##################################################################### -# BOOST -#################################################################### -# -# Cantera Boost Include -# -CANTERA_BOOST_INCLUDES= @BOOST_INCLUDE@ -# -# Location of the boost library that Cantera linked against -# -CANTERA_BOOST_LIB_DIR= @BOOST_LIB_DIR@ -# -# Linkage extras for linking against boost -# -ifeq ("x$(CANTERA_BOOST_LIB_DIR)","x") -CANTERA_BOOST_LIBS= -else -CANTERA_BOOST_LIBS= -L$(CANTERA_BOOST_LIB_DIR) -l@BOOST_LIB@ -endif - -##################################################################### -# CVODE/SUNDIALS LINKAGE -#################################################################### -CANTERA_use_sundials = @use_sundials@ - -# -# Includes for Sundials - none for cvode -# -CANTERA_CVODE_INCLUDE=@sundials_include@ -# -# Link line for cvode and sundials -# -ifeq ($(CANTERA_user_sundials), 1) - -else -CANTERA_CVODE_LIBS= -L$(CANTERA_LIBSDIR) @CVODE_LIBS@ -endif - - -####################################################################### -# BLAS LAPACK LINKAGE -####################################################################### -CANTERA_build_lapack= @build_lapack@ -CANTERA_build_blas= @build_blas@ - -CANTERA_BLAS_LAPACK_DIR= @BLAS_LAPACK_DIR@ - -CANTERA_BLAS_LAPACK_LIBS = -L$(CANTERA_BLAS_LAPACK_DIR) @BLAS_LAPACK_LIBS@ - -####################################################################### -# CANTERA's F2C Linkage -####################################################################### -CANTERA_build_with_f2c= @build_with_f2c@ -CANTERA_build_f2c_lib= @build_f2c_lib@ - -ifeq ($(CANTERA_build_f2c_lib), 1) -CANTERA_F2C_LIBS= -L$(CANTERA_LIBSDIR) -lctf2c -else -CANTERA_F2C_LIBS= @F2C_SYSTEMLIB@ -endif - - -##################################################################### -# COMBINATIONS OF INCLUDES AND LIBS -#################################################################### - -CANTERA_TOTAL_INCLUDES= $(CANTERA_CORE_INCLUDES) $(CANTERA_BOOST_INCLUDES) $(CANTERA_CVODE_INCLUDE) -# -# You can add this into the compilation environment to identify the version number -# -CANTERA_DEFINES = -DCANTERA_VERSION=@ctversion@ - -CANTERA_TOTAL_LIBS2 = @LOCAL_LIB_DIRS@ @LOCAL_LIBS@ - -CANTERA_TOTAL_LIBS= $(CANTERA_CORE_LIBS) $(CANTERA_BOOST_LIBS) \ - $(CANTERA_CVODE_LIBS) $(CANTERA_BLAS_LAPACK_LIBS) \ - $(CANTERA_F2C_LIBS) - -# -# Dependency Line -# -CANTERA_LIBS_DEP= @INSTALL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a - diff --git a/Cantera/cxx/include/Cantera.h b/Cantera/cxx/src/Cantera.h similarity index 100% rename from Cantera/cxx/include/Cantera.h rename to Cantera/cxx/src/Cantera.h diff --git a/Cantera/cxx/include/Edge.h b/Cantera/cxx/src/Edge.h similarity index 100% rename from Cantera/cxx/include/Edge.h rename to Cantera/cxx/src/Edge.h diff --git a/Cantera/cxx/include/GRI30.h b/Cantera/cxx/src/GRI30.h similarity index 100% rename from Cantera/cxx/include/GRI30.h rename to Cantera/cxx/src/GRI30.h diff --git a/Cantera/cxx/include/IdealGasMix.h b/Cantera/cxx/src/IdealGasMix.h similarity index 100% rename from Cantera/cxx/include/IdealGasMix.h rename to Cantera/cxx/src/IdealGasMix.h diff --git a/Cantera/cxx/include/IncompressibleSolid.h b/Cantera/cxx/src/IncompressibleSolid.h similarity index 100% rename from Cantera/cxx/include/IncompressibleSolid.h rename to Cantera/cxx/src/IncompressibleSolid.h diff --git a/Cantera/cxx/include/Interface.h b/Cantera/cxx/src/Interface.h similarity index 100% rename from Cantera/cxx/include/Interface.h rename to Cantera/cxx/src/Interface.h diff --git a/Cantera/cxx/src/Makefile.am b/Cantera/cxx/src/Makefile.am index af723bf44..30c3558c7 100644 --- a/Cantera/cxx/src/Makefile.am +++ b/Cantera/cxx/src/Makefile.am @@ -23,6 +23,6 @@ __top_builddir__build_lib_libctcxx_includedir = $(prefix)/include # header file accumulation all: @echo copying headers $< - cp -u ../include/*.h $(top_builddir)/build/include/ + cp -p ../include/*.h $(top_builddir)/build/include/ CLEANFILES = *.o diff --git a/Cantera/cxx/include/Metal.h b/Cantera/cxx/src/Metal.h similarity index 100% rename from Cantera/cxx/include/Metal.h rename to Cantera/cxx/src/Metal.h diff --git a/Cantera/cxx/include/PureFluid.h b/Cantera/cxx/src/PureFluid.h similarity index 100% rename from Cantera/cxx/include/PureFluid.h rename to Cantera/cxx/src/PureFluid.h diff --git a/Cantera/cxx/include/electrolyteThermo.h b/Cantera/cxx/src/electrolyteThermo.h similarity index 100% rename from Cantera/cxx/include/electrolyteThermo.h rename to Cantera/cxx/src/electrolyteThermo.h diff --git a/Cantera/cxx/include/equilibrium.h b/Cantera/cxx/src/equilibrium.h similarity index 100% rename from Cantera/cxx/include/equilibrium.h rename to Cantera/cxx/src/equilibrium.h diff --git a/Cantera/cxx/include/importPhase.h b/Cantera/cxx/src/importPhase.h similarity index 100% rename from Cantera/cxx/include/importPhase.h rename to Cantera/cxx/src/importPhase.h diff --git a/Cantera/cxx/include/integrators.h b/Cantera/cxx/src/integrators.h similarity index 100% rename from Cantera/cxx/include/integrators.h rename to Cantera/cxx/src/integrators.h diff --git a/Cantera/cxx/include/kinetics.h b/Cantera/cxx/src/kinetics.h similarity index 100% rename from Cantera/cxx/include/kinetics.h rename to Cantera/cxx/src/kinetics.h diff --git a/Cantera/cxx/include/numerics.h b/Cantera/cxx/src/numerics.h similarity index 100% rename from Cantera/cxx/include/numerics.h rename to Cantera/cxx/src/numerics.h diff --git a/Cantera/cxx/include/onedim.h b/Cantera/cxx/src/onedim.h similarity index 100% rename from Cantera/cxx/include/onedim.h rename to Cantera/cxx/src/onedim.h diff --git a/Cantera/cxx/include/radiation.h b/Cantera/cxx/src/radiation.h similarity index 100% rename from Cantera/cxx/include/radiation.h rename to Cantera/cxx/src/radiation.h diff --git a/Cantera/cxx/include/reactionpaths.h b/Cantera/cxx/src/reactionpaths.h similarity index 100% rename from Cantera/cxx/include/reactionpaths.h rename to Cantera/cxx/src/reactionpaths.h diff --git a/Cantera/cxx/include/spectra.h b/Cantera/cxx/src/spectra.h similarity index 100% rename from Cantera/cxx/include/spectra.h rename to Cantera/cxx/src/spectra.h diff --git a/Cantera/cxx/include/surface.h b/Cantera/cxx/src/surface.h similarity index 100% rename from Cantera/cxx/include/surface.h rename to Cantera/cxx/src/surface.h diff --git a/Cantera/cxx/include/thermo.h b/Cantera/cxx/src/thermo.h similarity index 100% rename from Cantera/cxx/include/thermo.h rename to Cantera/cxx/src/thermo.h diff --git a/Cantera/cxx/include/transport.h b/Cantera/cxx/src/transport.h similarity index 100% rename from Cantera/cxx/include/transport.h rename to Cantera/cxx/src/transport.h diff --git a/Cantera/cxx/include/zerodim.h b/Cantera/cxx/src/zerodim.h similarity index 100% rename from Cantera/cxx/include/zerodim.h rename to Cantera/cxx/src/zerodim.h