From 3a3657275ba9bb7791d5ae322e07b68ee5d50d3e Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Thu, 9 Feb 2012 21:03:06 +0000 Subject: [PATCH] [cantera]: fixing 'make install' -- thanks to Todd Oliver's sharp eyes on this one. --- Cantera/cxx/src/Makefile.am | 6 ++++++ Cantera/ext/cvode/Makefile.am | 3 +++ Cantera/ext/f2c_blas/Makefile.am | 4 ++++ Cantera/ext/f2c_lapack/Makefile.am | 4 ++++ Cantera/ext/f2c_libs/Makefile.am | 4 ++++ Cantera/ext/f2c_math/Makefile.am | 4 ++++ Cantera/ext/tpx/Makefile.am | 4 ++++ Cantera/src/base/Makefile.am | 5 ++--- Cantera/src/converters/Makefile.am | 4 ++++ Cantera/src/equil/Makefile.am | 6 +++++- Cantera/src/kinetics/Makefile.am | 4 ++++ Cantera/src/numerics/Makefile.am | 3 +++ Cantera/src/oneD/Makefile.am | 3 +++ Cantera/src/thermo/Makefile.am | 2 ++ Cantera/src/transport/Makefile.am | 6 +++++- Cantera/src/zeroD/Makefile.am | 3 +++ 16 files changed, 60 insertions(+), 5 deletions(-) diff --git a/Cantera/cxx/src/Makefile.am b/Cantera/cxx/src/Makefile.am index a01693752..af723bf44 100644 --- a/Cantera/cxx/src/Makefile.am +++ b/Cantera/cxx/src/Makefile.am @@ -1,3 +1,5 @@ +h_sources = + cc_sources = importPhase.cpp AM_CPPFLAGS = -I$(top_builddir)/build/include @@ -14,6 +16,10 @@ library_include_HEADERS = $(h_sources) __top_builddir__build_lib_libctcxx_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctcxx_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctcxx_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctcxx_includedir = $(prefix)/include + + # header file accumulation all: @echo copying headers $< diff --git a/Cantera/ext/cvode/Makefile.am b/Cantera/ext/cvode/Makefile.am index dfef74fbd..21f7f9802 100644 --- a/Cantera/ext/cvode/Makefile.am +++ b/Cantera/ext/cvode/Makefile.am @@ -21,6 +21,9 @@ library_include_HEADERS = $(h_sources) __top_builddir__build_lib_libcvode_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libcvode_la_SOURCES = $(fc_sources) $(cc_sources) +__top_builddir__build_lib_libcvode_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libcvode_includedir = $(prefix)/include + CLEANFILES = *.o # header file accumulation diff --git a/Cantera/ext/f2c_blas/Makefile.am b/Cantera/ext/f2c_blas/Makefile.am index 108d15c26..c80242f58 100644 --- a/Cantera/ext/f2c_blas/Makefile.am +++ b/Cantera/ext/f2c_blas/Makefile.am @@ -57,6 +57,10 @@ library_include_HEADERS = $(h_sources) __top_builddir__build_lib_libctblas_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctblas_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctblas_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctblas_includedir = $(prefix)/include + + CLEANFILES = *.o # header file accumulation diff --git a/Cantera/ext/f2c_lapack/Makefile.am b/Cantera/ext/f2c_lapack/Makefile.am index 019a47083..5ee31aad4 100644 --- a/Cantera/ext/f2c_lapack/Makefile.am +++ b/Cantera/ext/f2c_lapack/Makefile.am @@ -24,6 +24,10 @@ library_include_HEADERS = $(h_sources) __top_builddir__build_lib_libctlapack_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctlapack_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctlapack_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctlapack_includedir = $(prefix)/include + + CLEANFILES = *.o # header file accumulation diff --git a/Cantera/ext/f2c_libs/Makefile.am b/Cantera/ext/f2c_libs/Makefile.am index e82959b15..b503c634a 100644 --- a/Cantera/ext/f2c_libs/Makefile.am +++ b/Cantera/ext/f2c_libs/Makefile.am @@ -60,4 +60,8 @@ all: __top_builddir__build_lib_libctf2c_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctf2c_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctf2c_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctf2c_includedir = $(prefix)/include + + CLEANFILES = *.o diff --git a/Cantera/ext/f2c_math/Makefile.am b/Cantera/ext/f2c_math/Makefile.am index f63e27ecc..8fcada505 100644 --- a/Cantera/ext/f2c_math/Makefile.am +++ b/Cantera/ext/f2c_math/Makefile.am @@ -39,6 +39,10 @@ library_include_HEADERS = $(h_sources) __top_builddir__build_lib_libctmath_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctmath_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctmath_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctmath_includedir = $(prefix)/include + + CLEANFILES = *.o # header file accumulation diff --git a/Cantera/ext/tpx/Makefile.am b/Cantera/ext/tpx/Makefile.am index c03d7284a..03a9971b4 100644 --- a/Cantera/ext/tpx/Makefile.am +++ b/Cantera/ext/tpx/Makefile.am @@ -18,6 +18,10 @@ library_include_HEADERS = $(h_sources) __top_builddir__build_lib_libtpx_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libtpx_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libtpx_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libtpx_includedir = $(prefix)/include + + CLEANFILES = *.o # header file accumulation diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am index bb72fd831..4095a095e 100644 --- a/Cantera/src/base/Makefile.am +++ b/Cantera/src/base/Makefile.am @@ -26,9 +26,8 @@ otherinclude_HEADERS = $(h_sources) __top_builddir__build_lib_libctbase_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources) -__top_builddir__build_lib_libctbase_include = $(h_sources) -__top_builddir__build_lib_libctbase_includedir = $(prefix)/include - +__top_builddir__build_lib_libctbase_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctbase_includedir = $(prefix)/include # header file accumulation -- only copy if file updated! all: diff --git a/Cantera/src/converters/Makefile.am b/Cantera/src/converters/Makefile.am index 61c96b495..26fe964a6 100644 --- a/Cantera/src/converters/Makefile.am +++ b/Cantera/src/converters/Makefile.am @@ -19,6 +19,10 @@ library_includedir = $(includedir) __top_builddir__build_lib_libconverters_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libconverters_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libconverters_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libconverters_includedir = $(prefix)/include + + # header file accumulation all: @echo copying headers $< diff --git a/Cantera/src/equil/Makefile.am b/Cantera/src/equil/Makefile.am index c94af37b5..e7162fb0d 100644 --- a/Cantera/src/equil/Makefile.am +++ b/Cantera/src/equil/Makefile.am @@ -45,7 +45,11 @@ library_includedir = $(includedir) __top_builddir__build_lib_libequil_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libequil_la_SOURCES = $(cc_sources) $(h_sources) -# header file accumulation +__top_builddir__build_lib_libequil_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libequil_includedir = $(prefix)/include + + +# header file accumulation before install all: @echo copying headers $< cp -u *.h $(top_builddir)/build/include/ diff --git a/Cantera/src/kinetics/Makefile.am b/Cantera/src/kinetics/Makefile.am index 584698c66..3302085d3 100644 --- a/Cantera/src/kinetics/Makefile.am +++ b/Cantera/src/kinetics/Makefile.am @@ -25,6 +25,10 @@ library_includedir = $(includedir) __top_builddir__build_lib_libkinetics_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libkinetics_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libkinetics_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libkinetics_includedir = $(prefix)/include + + # header file accumulation all: @echo copying headers $< diff --git a/Cantera/src/numerics/Makefile.am b/Cantera/src/numerics/Makefile.am index 72e695cb6..cc8d8cf13 100644 --- a/Cantera/src/numerics/Makefile.am +++ b/Cantera/src/numerics/Makefile.am @@ -20,6 +20,9 @@ library_includedir = $(includedir) __top_builddir__build_lib_libctnumerics_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libctnumerics_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libctnumerics_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libctnumerics_includedir = $(prefix)/include + # header file accumulation all: diff --git a/Cantera/src/oneD/Makefile.am b/Cantera/src/oneD/Makefile.am index 56affcb29..742f8258c 100644 --- a/Cantera/src/oneD/Makefile.am +++ b/Cantera/src/oneD/Makefile.am @@ -18,6 +18,9 @@ library_includedir = $(includedir) __top_builddir__build_lib_liboneD_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_liboneD_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_liboneD_include_HEADERS = $(h_sources) +__top_builddir__build_lib_liboneD_includedir = $(prefix)/include + # header file accumulation all: diff --git a/Cantera/src/thermo/Makefile.am b/Cantera/src/thermo/Makefile.am index 217268a09..eb0f6712e 100644 --- a/Cantera/src/thermo/Makefile.am +++ b/Cantera/src/thermo/Makefile.am @@ -56,6 +56,8 @@ library_includedir = $(includedir) __top_builddir__build_lib_libthermo_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libthermo_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libthermo_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libthermo_includedir = $(prefix)/include # header file accumulation all: diff --git a/Cantera/src/transport/Makefile.am b/Cantera/src/transport/Makefile.am index 1a5210daa..a0654b70e 100644 --- a/Cantera/src/transport/Makefile.am +++ b/Cantera/src/transport/Makefile.am @@ -3,7 +3,8 @@ h_sources = AqueousTransport.h LiquidTransportData.h L_matrix.h \ DustyGasTransport.h LiquidTransport.h MixTransport.h \ SimpleTransport.h TransportFactory.h FtnTransport.h \ LiquidTransportParams.h MMCollisionInt.h \ - SolidTransport.h TransportParams.h WaterSSTP.h + SolidTransport.h TransportParams.h +# WaterSSTP.h cc_sources = AqueousTransport.cpp LiquidTransport.cpp MMCollisionInt.cpp \ SimpleTransport.cpp TransportBase.cpp WaterTransport.cpp \ @@ -23,6 +24,9 @@ library_includedir = $(includedir) __top_builddir__build_lib_libtransport_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libtransport_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libtransport_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libtransport_includedir = $(prefix)/include + # header file accumulation all: diff --git a/Cantera/src/zeroD/Makefile.am b/Cantera/src/zeroD/Makefile.am index 670de7274..3f0b728e3 100644 --- a/Cantera/src/zeroD/Makefile.am +++ b/Cantera/src/zeroD/Makefile.am @@ -19,6 +19,9 @@ library_includedir = $(includedir) __top_builddir__build_lib_libzeroD_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) __top_builddir__build_lib_libzeroD_la_SOURCES = $(cc_sources) $(h_sources) +__top_builddir__build_lib_libzeroD_include_HEADERS = $(h_sources) +__top_builddir__build_lib_libzeroD_includedir = $(prefix)/include + # header file accumulation all: @echo copying headers $<