Simplify documentation generation, remove obsolete file.

Doxybook and Doxyfile have been compared and differences have
been adjusted so there are only _relevant_ differences now.

The dependency on fltk-book.tex in html generation has been removed.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10718 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 10 insertions, 14 deletions

diff --git a/documentation/Doxybook b/documentation/Doxybook
index 005976da5..fcc1afaf9 100644
--- a/documentation/Doxybook
+++ b/documentation/Doxybook
@@ -805,7 +805,7 @@ HTML_FOOTER            = src/html_footer
 # the style sheet file to the HTML output directory, so don't put your own
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        = src/html_stylesheet.css
+HTML_STYLESHEET        =
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
 # files or namespaces will be aligned in HTML using tables. If set to
diff --git a/documentation/Doxyfile b/documentation/Doxyfile
index 126371416..c181370cb 100644
--- a/documentation/Doxyfile
+++ b/documentation/Doxyfile
@@ -578,7 +578,7 @@ INPUT                  = src/index.dox \
                          src/license.dox \
                          src/examples.dox \
                          src/faq.dox \
-			 ../src/Fl_Sys_Menu_Bar.mm
+                         ../src/Fl_Sys_Menu_Bar.mm
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -613,7 +613,7 @@ RECURSIVE              = YES
 
 EXCLUDE                = ../src/fl_font_win32.cxx \
                          ../src/fl_font_mac.cxx \
-			 ../src/aimm.h
+                         ../src/aimm.h
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
@@ -1013,7 +1013,7 @@ EXTRA_PACKAGES         =
 # the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
-LATEX_HEADER           = src/fltk-book.tex
+LATEX_HEADER           =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
 # is prepared for conversion to pdf (using ps2pdf). The pdf file will
diff --git a/documentation/Makefile b/documentation/Makefile
index e623581a8..d6bcd7dd1 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -131,7 +131,7 @@ uninstall-linux uninstall-osx:
 # is not made by default.
 # Use `make html' or `make docs' to create the html docs.
 
-html:	$(HTMLFILES) Doxyfile src/fltk-book.tex
+html:	$(HTMLFILES) Doxyfile
 	echo "Generating HTML documentation..."
 	-$(RMDIR) html
 	-$(INSTALL_DIR) html
@@ -158,9 +158,10 @@ refman.pdf: $(HTMLFILES) Doxybook src/fltk-book.tex
 src/fltk-book.tex: src/fltk-book.tex.in
 	DOXY_VERSION=`$(DOXYDOC) --version`; \
 	YEAR=`date +%Y`; \
-	FLTK_VERSION=`cat ../VERSION`; \
-	sed -e"s/@YEAR@/$$YEAR/g" -e"s/@VERSION@/$$FLTK_VERSION/g" \
-	    -e"s/@DOXY_VERSION@/$$DOXY_VERSION/g" < $< > $@
+	sed -e"s/@YEAR@/$$YEAR/g" \
+	    -e"s/@FL_VERSION@/$(FL_VERSION)/g" \
+	    -e"s/@DOXY_VERSION@/$$DOXY_VERSION/g" \
+	< $< > $@
 
 #
 # End of "$Id$".
diff --git a/documentation/src/fltk-book.tex.in b/documentation/src/fltk-book.tex.in
index e3cdb8f2e..13361ba24 100644
--- a/documentation/src/fltk-book.tex.in
+++ b/documentation/src/fltk-book.tex.in
@@ -34,7 +34,7 @@
 \begin{titlepage}
 \vspace*{4.5cm}
 \begin{center}
-{\Huge FLTK @VERSION@ Programming Manual}\\
+{\Huge FLTK @FL_VERSION@ Programming Manual}\\
 \vspace*{2cm}
 \begin{ImageNoCaption}
  \mbox{\includegraphics[width=6cm]{FL200}}
diff --git a/documentation/strip_tags b/documentation/strip_tags
deleted file mode 100755
index f03276f24..000000000
--- a/documentation/strip_tags
+++ /dev/null
@@ -1,5 +0,0 @@
-for f in html/*.html ; do
-  sed 's/<!-- ... ... .*:..:..\. -->/<!-- date removed for reducing unnecessary svn web updates  -->/' $f > $f.tmp
-  rm $f
-  mv $f.tmp $f
-done