solaris port
Added the @CXX_DEPENDS@ variable.
This commit is contained in:
parent
c944babc03
commit
271f6edbe9
12 changed files with 17 additions and 18 deletions
|
|
@ -100,7 +100,7 @@ win-install:
|
|||
|
||||
|
||||
%.d:
|
||||
g++ -MM $(CXX_INCLUDES) $*.cpp > $*.d
|
||||
@CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d
|
||||
|
||||
depends: $(DEPENDS)
|
||||
cat *.d > .depends
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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@
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue