Moved the tools/doc directory directly into docs.

Makefile.in

@@ -249,20 +249,18 @@ clean:
 	-$(RMDIRTREE) *.*~ @buildlib@/*.* build/include/cantera/config.h svn*~
 	-cd Cantera; @MAKE@ clean
 	-cd tools; @MAKE@ clean
+	-cd docs; @MAKE@ clean
 	-cd ext; @MAKE@ clean
 	-cd test_problems; @MAKE@ clean
 	-$(RM) mt.mod
 
 docs:
-	cd tools/doxygen/Cantera; doxygen Cantera.cfg
+	cd docs; doxygen Cantera.cfg
 
 depends:
 	cd Cantera; @MAKE@ depends
 	cd tools; @MAKE@ depends
 	cd ext; @MAKE@ depends
-ifeq ($(build_particles),1)
-		cd Cantera/cads; @MAKE@ depends
-endif
 
 ChangeLog: CVS/Entries 
 	tools/bin/cvs2cl.pl --prune

configure.in

@@ -1907,9 +1907,9 @@ AC_OUTPUT(Makefile \
           ext/f2c_math/Makefile \
 	  examples/Makefile \
           examples/cxx/Makefile \
+	  docs/Makefile \
 	  tools/Makefile \
-          tools/doc/Cantera.cfg \
-          tools/doc/Makefile \
+          docs/Cantera.cfg \
           tools/src/Makefile \
           tools/src/sample.mak \
           tools/src/finish_install.py \

docs/Cantera.cfg.in

@@ -44,7 +44,7 @@ PROJECT_NUMBER         = 1.8
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @ctroot@/tools/doc
+OUTPUT_DIRECTORY       = @ctroot@/docs
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -590,14 +590,14 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../../Cantera/src \
-                         ../../Cantera/src/base \
-                         ../../Cantera/src/numerics \
-                         ../../Cantera/src/thermo \
-                         ../../Cantera/src/equil \
-                         ../../Cantera/src/kinetics \
-                         ../../Cantera/src/transport \
-                         ../../Cantera/cxx/include \
+INPUT                  = ../Cantera/src \
+                         ../Cantera/src/base \
+                         ../Cantera/src/numerics \
+                         ../Cantera/src/thermo \
+                         ../Cantera/src/equil \
+                         ../Cantera/src/kinetics \
+                         ../Cantera/src/transport \
+                         ../Cantera/cxx/include \
                          doxyinput
 
 # This tag can be used to specify the character encoding of the source files

docs/Makefile.in

@@ -1,7 +1,7 @@
 #
-# $Revision$
-# $Author$
-# $Date$
+# $Revision: 255 $
+# $Author: hkmoffa $
+# $Date: 2009-11-09 16:36:49 -0700 (Mon, 09 Nov 2009) $
 #
 build_ck=@BUILD_CK@
 

tools/doc/html/.cvsignore

@@ -1,11 +0,0 @@
-*.html
-*.md5
-*.png
-*.dot
-*.gif
-*.hhc
-*.hhk
-*.hhp
-*.map
-*.css
-formula.repository