From 87167641cfe767c7c941df8c8f16c097032cb7fb Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Thu, 21 Aug 2003 17:48:36 +0000 Subject: [PATCH] changed fortran to fortran/src. Added particle hooks which should all be turned off by default. --- Cantera/Makefile.in | 53 +++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/Cantera/Makefile.in b/Cantera/Makefile.in index 3c4ca6eb7..52cd67896 100755 --- a/Cantera/Makefile.in +++ b/Cantera/Makefile.in @@ -7,45 +7,56 @@ # Copyright 2001 California Institute of Technology # See file License.txt for licensing information # -# $Log$ -# Revision 1.1 2003-04-14 17:57:49 dggoodwin -# Initial revision -# -# Revision 1.6 2002/12/16 13:25:57 dgg -# *** empty log message *** -# -# Revision 1.5 2002/08/24 23:25:06 dgg -# *** empty log message *** -# -# Revision 1.4 2002/08/14 07:37:42 dgg -# *** empty log message *** -# -# Revision 1.3 2002/01/12 06:43:42 dgg -# *** empty log message *** -# ############################################################### build_f90=@BUILD_F90@ build_python=@BUILD_PYTHON@ +build_particles=@BUILD_PARTICLES@ all: cd src; @MAKE@ + cd cxx; @MAKE@ + cd clib/src; @MAKE@ ifeq ($(build_f90),1) - cd fortran; @MAKE@ + cd fortran/src; @MAKE@ +endif +ifeq ($(build_particles),1) + cd cads; @MAKE@ endif - clean: - $(RM) ../lib/libcantera.a cd src; @MAKE@ clean + cd cxx; @MAKE@ clean cd clib/src; @MAKE@ clean cd python; @MAKE@ clean +ifeq ($(build_f90),1) + cd fortran/src; @MAKE@ clean +endif +ifeq ($(build_particles),1) + cd cads; @MAKE@ clean +endif depends: cd src; @MAKE@ depends + cd cxx; @MAKE@ depends cd clib/src; @MAKE@ depends +ifeq ($(build_f90),1) + cd fortran/src; @MAKE@ depends +endif +ifeq ($(build_particles),1) + cd cads; @MAKE@ depends +endif + +install: + cd src; @MAKE@ install + cd cxx; @MAKE@ install + cd clib/src; @MAKE@ install +ifeq ($(build_f90),1) + cd fortran/src; @MAKE@ install +endif +ifeq ($(build_particles),1) + cd cads; @MAKE@ install +endif # end of file - -