diff --git a/Cantera/clib/src/Makefile.in b/Cantera/clib/src/Makefile.in index ae8480ed2..76415c4da 100755 --- a/Cantera/clib/src/Makefile.in +++ b/Cantera/clib/src/Makefile.in @@ -100,7 +100,7 @@ win-install: %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d depends: $(DEPENDS) cat *.d > .depends diff --git a/Cantera/cxx/demos/Makefile.in b/Cantera/cxx/demos/Makefile.in index 61b816e30..0552fd5b7 100644 --- a/Cantera/cxx/demos/Makefile.in +++ b/Cantera/cxx/demos/Makefile.in @@ -1,5 +1,3 @@ -#!/bin/sh - ############################################################################ # # Makefile to compile and link a C++ application to @@ -65,7 +63,7 @@ LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ # how to create a dependency file .@CXX_EXT@.d: - g++ -MM -I$(CANTERA_INCDIR) $(CXX_FLAGS) $(LOCAL_DEFNS) $*.cpp > $*.d + @CXX_DEPENDS@ -I$(CANTERA_INCDIR) $(CXX_FLAGS) $(LOCAL_DEFNS) $*.cpp > $*.d PROGRAM = $(PROG_NAME)$(EXE_EXT) diff --git a/Cantera/cxx/src/Makefile.in b/Cantera/cxx/src/Makefile.in index 33f0cfd52..ea2f1a748 100644 --- a/Cantera/cxx/src/Makefile.in +++ b/Cantera/cxx/src/Makefile.in @@ -48,7 +48,7 @@ install: @INSTALL@ $(CXXLIB) @prefix@/lib/cantera %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d depends: $(DEPENDS) cat *.d > .depends diff --git a/Cantera/fortran/src/Makefile.in b/Cantera/fortran/src/Makefile.in index 29d9fce46..fe94f1795 100644 --- a/Cantera/fortran/src/Makefile.in +++ b/Cantera/fortran/src/Makefile.in @@ -93,7 +93,7 @@ win-install: @INSTALL@ ../../../lib/fct.lib @ct_libdir@ %.d: %.cpp - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d depends: $(DEPENDS) cat *.d > .depends diff --git a/Cantera/matlab/Makefile.in b/Cantera/matlab/Makefile.in index a0c249599..b63d21c26 100644 --- a/Cantera/matlab/Makefile.in +++ b/Cantera/matlab/Makefile.in @@ -46,7 +46,7 @@ endif DEPENDS = $(SRCS:.cpp=.d) .cpp.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d all: cantera/ctmethods.@mex_ext@ diff --git a/Cantera/src/Makefile.in b/Cantera/src/Makefile.in index 678aa0501..cf906e6d7 100755 --- a/Cantera/src/Makefile.in +++ b/Cantera/src/Makefile.in @@ -180,7 +180,7 @@ ALL_H = $(BASE_H) $(THERMO_H) $(KINETICS_H) $(HETEROKIN_H) \ $(EQUIL_H) $(SOLVERS_H) $(RPATH_H) .cpp.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< $(CXX_INCLUDES) $(CXX_FLAGS) @@ -189,13 +189,13 @@ ODE_integrators.o: @CXX@ -c ODE_integrators.cpp $(CXX_INCLUDES) $(SUNDIALS_INC) \ $(CXX_FLAGS) ODE_integrators.d: ODE_integrators.cpp Makefile - g++ -MM ODE_integrators.cpp $(CXX_INCLUDES) $(SUNDIALS_INC) \ + @CXX_DEPENDS@ ODE_integrators.cpp $(CXX_INCLUDES) $(SUNDIALS_INC) \ $(CXX_FLAGS) > ODE_integrators.d DAE_solvers.o: DAE_solvers.cpp @CXX@ -c DAE_solvers.cpp $(CXX_INCLUDES) $(SUNDIALS_INC) $(CXX_FLAGS) DAE_solvers.d: DAE_solvers.cpp Makefile - g++ -MM DAE_solvers.cpp $(CXX_INCLUDES) $(SUNDIALS_INC) \ + @CXX_DEPENDS@ DAE_solvers.cpp $(CXX_INCLUDES) $(SUNDIALS_INC) \ $(CXX_FLAGS) > DAE_solvers.d lib: $(OBJ_LIB) diff --git a/Cantera/src/converters/Makefile.in b/Cantera/src/converters/Makefile.in index a2aee3dad..585ec5c8e 100644 --- a/Cantera/src/converters/Makefile.in +++ b/Cantera/src/converters/Makefile.in @@ -38,7 +38,7 @@ all: $(CONV_LIB) done) %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES) diff --git a/Cantera/src/oneD/Makefile.in b/Cantera/src/oneD/Makefile.in index 05f110b57..11ad84d4f 100644 --- a/Cantera/src/oneD/Makefile.in +++ b/Cantera/src/oneD/Makefile.in @@ -29,7 +29,7 @@ ONED_LIB = @buildlib@/liboneD.a DEPENDS = $(OBJS:.o=.d) %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< @DEFS@ $(CXX_FLAGS) $(CXX_INCLUDES) diff --git a/Cantera/src/thermo/Makefile.in b/Cantera/src/thermo/Makefile.in index a2e79fe2c..14b4aacd0 100644 --- a/Cantera/src/thermo/Makefile.in +++ b/Cantera/src/thermo/Makefile.in @@ -28,14 +28,15 @@ ELECTRO_OBJ = SingleSpeciesTP.o StoichSubstanceSSTP.o \ IdealSolidSolnPhase.o IdealMolalSoln.o \ WaterPropsIAPWSphi.o WaterPropsIAPWS.o WaterProps.o \ PDSS.o WaterPDSS.o WaterTP.o \ - HMWSoln.o HMWSoln_input.o DebyeHuckel.o + HMWSoln.o HMWSoln_input.o DebyeHuckel.o \ + IdealGasPDSS.o ELECTRO_H = SingleSpeciesTP.h StoichSubstanceSSTP.h \ MolalityVPSSTP.h VPStandardStateTP.h \ IdealSolidSolnPhase.h IdealMolalSoln.h \ WaterPropsIAPWSphi.h WaterPropsIAPWS.h WaterProps.h \ PDSS.h WaterPDSS.h WaterTP.h HMWSoln.h electrolytes.h \ - DebyeHuckel.h + DebyeHuckel.h IdealGasPDSS.o endif ifeq ($(do_issp),1) ISSP_OBJ = IdealSolidSolnPhase.o @@ -58,7 +59,7 @@ all: $(LIB) .depends $(INSTALL_TSC) "$${lh}" $(INCDIR) ; \ done) %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES) diff --git a/Cantera/src/transport/Makefile.in b/Cantera/src/transport/Makefile.in index 7f7602549..8ecfa5bf9 100644 --- a/Cantera/src/transport/Makefile.in +++ b/Cantera/src/transport/Makefile.in @@ -35,7 +35,7 @@ all: $(LIB) $(INSTALL_TSC) "$${lh}" $(INCDIR) ; \ done) %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES) diff --git a/Cantera/src/zeroD/Makefile.in b/Cantera/src/zeroD/Makefile.in index cb88d445c..4b3eac1ec 100644 --- a/Cantera/src/zeroD/Makefile.in +++ b/Cantera/src/zeroD/Makefile.in @@ -36,7 +36,7 @@ all: .depends $(ZEROD_LIB) done) %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< @DEFS@ $(CXX_FLAGS) $(CXX_INCLUDES) diff --git a/Cantera/user/Makefile.in b/Cantera/user/Makefile.in index 3c15fd30a..1c7051ccc 100644 --- a/Cantera/user/Makefile.in +++ b/Cantera/user/Makefile.in @@ -33,7 +33,7 @@ LIB = @buildlib@/libuser.a DEPENDS = $(OBJS:.o=.d) %.d: - g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d + @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @CXX@ -c $< $(CXX_FLAGS) $(CXX_INCLUDES)