diff --git a/Makefile.in b/Makefile.in index b883f3b49..ea64d749f 100755 --- a/Makefile.in +++ b/Makefile.in @@ -13,21 +13,25 @@ build_ck = @BUILD_CK@ build_clib = @BUILD_CLIB@ build_python = @BUILD_PYTHON@ build_matlab = @BUILD_MATLAB@ +build_particles = @BUILD_PARTICLES@ os_is_win = @OS_IS_WIN@ incl_user_code = @INCL_USER_CODE@ prefix=@prefix@ -all: kernel user cxxlib hdr-collect clib python matlab utils datafiles +all: kernel user cxxlib hdr-collect clib python matlab particles \ + utils datafiles # use this target on a Windows machine to build the Python and # MATLAB interfaces after building the project in Visual C++ win: hdr-collect python matlab -install: hdr-install kernel-install data-install python-install matlab-install tools-install finish-install +install: hdr-install kernel-install data-install python-install \ + matlab-install particles-install tools-install finish-install -win-install: hdr-install win-kernel-install data-install python-install matlab-install finish-install +win-install: hdr-install win-kernel-install data-install python-install \ + matlab-install particles-install finish-install demos: example_codes @@ -99,6 +103,16 @@ hdr-collect: @INSTALL@ Cantera/src/converters/*.h build/include/cantera/kernel/converters @INSTALL@ Cantera/src/transport/*.h build/include/cantera/kernel/transport +particles: +ifeq ($(build_particles),1) + cd Cantera/cads; @MAKE@ +endif + +particles-install: +ifeq ($(build_particles),1) + cd Cantera/cads; @MAKE@ install +endif + python: @@ -146,7 +160,6 @@ endif finish-install: @INSTALL@ -d @ct_docdir@ @INSTALL@ -d @ct_bindir@ - #@INSTALL@ doc/*.pdf @ct_docdir@ @INSTALL@ -d @ct_demodir@/cxx @INSTALL@ Cantera/cxx/demos/*.cpp @ct_demodir@/cxx @@ -222,6 +235,9 @@ docs: depends: cd Cantera; @MAKE@ depends cd tools; @MAKE@ depends + ifeq ($(build_particles ,1) + cd Cantera/cads; @MAKE@ depends + endif export: @INSTALL@ -d $(export_dir)