Added - in front of some remove and clean commands. this causes the script not to fail if there is an error executing those commands.

This commit is contained in:
Harry Moffat 2008-01-04 22:16:07 +00:00
parent 21e2abb705
commit ccd79e6773

View file

@ -81,7 +81,7 @@ utils:
kernel-install: kernel-install:
@INSTALL@ -d @ct_libdir@ @INSTALL@ -d @ct_libdir@
rm -fR @ct_libdir@/* -rm -fR @ct_libdir@/*
( for ilib in @buildlib@/*.a ; do \ ( for ilib in @buildlib@/*.a ; do \
@INSTALL@ -c -m 644 $${ilib} @ct_libdir@ ; \ @INSTALL@ -c -m 644 $${ilib} @ct_libdir@ ; \
done ) done )
@ -96,7 +96,7 @@ endif
win-kernel-install: win-kernel-install:
@INSTALL@ -d @ct_libdir@ @INSTALL@ -d @ct_libdir@
$(RMDIRTREE) @ct_libdir@/* -$(RMDIRTREE) @ct_libdir@/*
( for ilib in @buildlib@/*.lib ; do \ ( for ilib in @buildlib@/*.lib ; do \
@INSTALL@ -c -m 644 $${ilib} @ct_libdir@ ; done ) @INSTALL@ -c -m 644 $${ilib} @ct_libdir@ ; done )
ifeq ($(use_dll),1) ifeq ($(use_dll),1)
@ -212,10 +212,10 @@ ifeq ($(os_is_win),0)
# if not a 'compact' installation, then add some symbolic links for convenience. # if not a 'compact' installation, then add some symbolic links for convenience.
ifeq ($(compact_install),0) ifeq ($(compact_install),0)
$(RMDIRTREE) @prefix@/cantera/demos -$(RMDIRTREE) @prefix@/cantera/demos
$(RMDIRTREE) @prefix@/cantera/data -$(RMDIRTREE) @prefix@/cantera/data
$(RMDIRTREE) @prefix@/cantera/templates -$(RMDIRTREE) @prefix@/cantera/templates
$(RMDIRTREE) @prefix@/cantera/tutorials -$(RMDIRTREE) @prefix@/cantera/tutorials
ln -s @ct_demodir@ @prefix@/cantera/demos ln -s @ct_demodir@ @prefix@/cantera/demos
ln -s @ct_datadir@ @prefix@/cantera/data ln -s @ct_datadir@ @prefix@/cantera/data
ln -s @ct_templdir@ @prefix@/cantera/templates ln -s @ct_templdir@ @prefix@/cantera/templates
@ -262,22 +262,22 @@ datafiles:
cd data/inputs; @MAKE@ cd data/inputs; @MAKE@
uninstall: uninstall:
$(RMDIRTREE) @ct_incdir@ -$(RMDIRTREE) @ct_incdir@
$(RMDIRTREE) @ct_libdir@ -$(RMDIRTREE) @ct_libdir@
$(RMDIRTREE) @ct_datadir@ -$(RMDIRTREE) @ct_datadir@
$(RMDIRTREE) @ct_demodir@ -$(RMDIRTREE) @ct_demodir@
$(RMDIRTREE) @ct_docdir@ -$(RMDIRTREE) @ct_docdir@
$(RMDIRTREE) @ct_tutdir@ -$(RMDIRTREE) @ct_tutdir@
$(RMDIRTREE) @prefix@/matlab/toolbox/cantera -$(RMDIRTREE) @prefix@/matlab/toolbox/cantera
cd tools; @MAKE@ uninstall cd tools; @MAKE@ uninstall
clean: clean:
$(RMDIRTREE) *.*~ @buildlib@/*.* build/include/cantera/config.h -$(RMDIRTREE) *.*~ @buildlib@/*.* build/include/cantera/config.h
cd Cantera; @MAKE@ clean -cd Cantera; @MAKE@ clean
cd tools; @MAKE@ clean -cd tools; @MAKE@ clean
cd ext; @MAKE@ clean -cd ext; @MAKE@ clean
cd test_problems; @MAKE@ clean -cd test_problems; @MAKE@ clean
$(RM) mt.mod -$(RM) mt.mod
docs: docs:
cd tools/doxygen/Cantera; doxygen Cantera.cfg cd tools/doxygen/Cantera; doxygen Cantera.cfg