mirror of https://github.com/fltk/fltk
Quote doxygen command where necessary
... if the doxygen path includes spaces. Done for configure/make + CMake.
This commit is contained in:
parent
08e64283aa
commit
32514e6d2b
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
# Makefile for the Fast Light Tool Kit (FLTK) documentation.
|
# Makefile for the Fast Light Tool Kit (FLTK) documentation.
|
||||||
#
|
#
|
||||||
# Copyright 1998-2022 by Bill Spitzak and others.
|
# Copyright 1998-2024 by Bill Spitzak and others.
|
||||||
#
|
#
|
||||||
# This library is free software. Distribution and use rights are outlined in
|
# This library is free software. Distribution and use rights are outlined in
|
||||||
# the file "COPYING" which should have been included with this file. If this
|
# the file "COPYING" which should have been included with this file. If this
|
||||||
|
@ -150,7 +150,7 @@ uninstall-linux uninstall-osx:
|
||||||
|
|
||||||
Doxyfile: Doxyfile.in generated.dox copyright.dox
|
Doxyfile: Doxyfile.in generated.dox copyright.dox
|
||||||
echo "Generating Doxyfile ..."
|
echo "Generating Doxyfile ..."
|
||||||
./convert_doxyfile $(DOXYDOC) $< $@ Doxyfile_error.log
|
./convert_doxyfile "$(DOXYDOC)" $< $@ Doxyfile_error.log
|
||||||
sed -e's,@FLTK_VERSION@,$(FLTK_VERSION),' \
|
sed -e's,@FLTK_VERSION@,$(FLTK_VERSION),' \
|
||||||
-e's,@GENERATE_HTML@,YES,' \
|
-e's,@GENERATE_HTML@,YES,' \
|
||||||
-e's,@GENERATE_LATEX@,NO,' \
|
-e's,@GENERATE_LATEX@,NO,' \
|
||||||
|
@ -163,8 +163,7 @@ Doxyfile: Doxyfile.in generated.dox copyright.dox
|
||||||
|
|
||||||
Doxybook: Doxyfile.in generated.dox copyright.dox
|
Doxybook: Doxyfile.in generated.dox copyright.dox
|
||||||
echo "Generating Doxybook ..."
|
echo "Generating Doxybook ..."
|
||||||
./convert_doxyfile $(DOXYDOC) $< $@ Doxybook_error.log
|
./convert_doxyfile "$(DOXYDOC)" $< $@ Doxybook_error.log
|
||||||
$(DOXYDOC) -u -s - < $< 2>Doxybook_error.log | \
|
|
||||||
sed -e's,@FLTK_VERSION@,$(FLTK_VERSION),' \
|
sed -e's,@FLTK_VERSION@,$(FLTK_VERSION),' \
|
||||||
-e's,@GENERATE_HTML@,NO,' \
|
-e's,@GENERATE_HTML@,NO,' \
|
||||||
-e's,@GENERATE_LATEX@,YES,' \
|
-e's,@GENERATE_LATEX@,YES,' \
|
||||||
|
@ -184,7 +183,7 @@ html: $(HTMLFILES) Doxyfile
|
||||||
echo "Generating HTML documentation..."
|
echo "Generating HTML documentation..."
|
||||||
-$(RMDIR) html
|
-$(RMDIR) html
|
||||||
-$(INSTALL_DIR) html
|
-$(INSTALL_DIR) html
|
||||||
-$(DOXYDOC)
|
-"$(DOXYDOC)"
|
||||||
if test "x$(DOXYDOC)" = "x" ; then \
|
if test "x$(DOXYDOC)" = "x" ; then \
|
||||||
echo "Sorry - doxygen not found. Please install doxygen and run configure."; \
|
echo "Sorry - doxygen not found. Please install doxygen and run configure."; \
|
||||||
fi
|
fi
|
||||||
|
@ -200,7 +199,7 @@ pdf: refman.pdf
|
||||||
refman.pdf: $(HTMLFILES) Doxybook src/fltk-book.tex
|
refman.pdf: $(HTMLFILES) Doxybook src/fltk-book.tex
|
||||||
-$(RMDIR) latex
|
-$(RMDIR) latex
|
||||||
echo "Generating PDF documentation ..."
|
echo "Generating PDF documentation ..."
|
||||||
$(DOXYDOC) Doxybook
|
"$(DOXYDOC)" Doxybook
|
||||||
./make_pdf
|
./make_pdf
|
||||||
|
|
||||||
src/fltk-title.tex: src/fltk-title.tex.in
|
src/fltk-title.tex: src/fltk-title.tex.in
|
||||||
|
@ -211,11 +210,11 @@ src/fltk-title.tex: src/fltk-title.tex.in
|
||||||
|
|
||||||
src/fltk-book.tex.in: src/fltk-title.tex
|
src/fltk-book.tex.in: src/fltk-title.tex
|
||||||
echo "Generating $@ ..."
|
echo "Generating $@ ..."
|
||||||
./make_header $(DOXYDOC) $< $@
|
./make_header "$(DOXYDOC)" $< $@
|
||||||
|
|
||||||
src/fltk-book.tex: src/fltk-book.tex.in
|
src/fltk-book.tex: src/fltk-book.tex.in
|
||||||
echo "Generating $@ ..."
|
echo "Generating $@ ..."
|
||||||
DOXY_VERSION=`$(DOXYDOC) --version|cut -f1 -d' '`; \
|
DOXY_VERSION=`"$(DOXYDOC)" --version|cut -f1 -d' '`; \
|
||||||
YEAR=`date +%Y`; \
|
YEAR=`date +%Y`; \
|
||||||
sed -e"s/@YEAR@/$$YEAR/g" \
|
sed -e"s/@YEAR@/$$YEAR/g" \
|
||||||
-e"s/@FLTK_VERSION@/$(FLTK_VERSION)/g" \
|
-e"s/@FLTK_VERSION@/$(FLTK_VERSION)/g" \
|
||||||
|
@ -226,7 +225,7 @@ generated.dox: generated.dox.in
|
||||||
echo "Generating $@ ..."
|
echo "Generating $@ ..."
|
||||||
CURRENT_DATE=`date "+%b %d, %Y"`; \
|
CURRENT_DATE=`date "+%b %d, %Y"`; \
|
||||||
GIT_REVISION=`git rev-parse --short=10 HEAD`; \
|
GIT_REVISION=`git rev-parse --short=10 HEAD`; \
|
||||||
DOXYGEN_VERSION_SHORT=`$(DOXYDOC) --version|cut -f1 -d' '`; \
|
DOXYGEN_VERSION_SHORT=`"$(DOXYDOC)" --version|cut -f1 -d' '`; \
|
||||||
sed -e"s/@CURRENT_DATE@/$$CURRENT_DATE/g" \
|
sed -e"s/@CURRENT_DATE@/$$CURRENT_DATE/g" \
|
||||||
-e"s/@GIT_REVISION@/$$GIT_REVISION/g" \
|
-e"s/@GIT_REVISION@/$$GIT_REVISION/g" \
|
||||||
-e"s/@DOXYGEN_VERSION_SHORT@/$$DOXYGEN_VERSION_SHORT/g" \
|
-e"s/@DOXYGEN_VERSION_SHORT@/$$DOXYGEN_VERSION_SHORT/g" \
|
||||||
|
|
|
@ -31,7 +31,7 @@ LOGFILE="$4"
|
||||||
|
|
||||||
# get doxygen version
|
# get doxygen version
|
||||||
|
|
||||||
VERSION=$($DOXYGEN --version)
|
VERSION=$("$DOXYGEN" --version)
|
||||||
|
|
||||||
# write info header to LOGFILE
|
# write info header to LOGFILE
|
||||||
|
|
||||||
|
@ -41,4 +41,4 @@ echo "" >> $LOGFILE
|
||||||
|
|
||||||
# convert doxygen file and append errors and warnings to LOGFILE
|
# convert doxygen file and append errors and warnings to LOGFILE
|
||||||
|
|
||||||
${DOXYGEN} -u -s - < $INFILE > $OUTFILE 2>> $LOGFILE
|
"${DOXYGEN}" -u -s - < $INFILE > $OUTFILE 2>> $LOGFILE
|
||||||
|
|
|
@ -48,7 +48,7 @@ fi
|
||||||
# with our PDF document title page (LaTeX code) and write the
|
# with our PDF document title page (LaTeX code) and write the
|
||||||
# result to $DOXY_HEAD.
|
# result to $DOXY_HEAD.
|
||||||
|
|
||||||
$DOXY_CMD -w latex $DOXY_TEMP /dev/null /dev/null
|
"$DOXY_CMD" -w latex $DOXY_TEMP /dev/null /dev/null
|
||||||
|
|
||||||
# combine three parts of these files to the output file
|
# combine three parts of these files to the output file
|
||||||
# using '( ... ) > $DOXY_HEAD' to write (concatenate)
|
# using '( ... ) > $DOXY_HEAD' to write (concatenate)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||||
#
|
#
|
||||||
# Copyright 1998-2023 by Bill Spitzak and others.
|
# Copyright 1998-2024 by Bill Spitzak and others.
|
||||||
#
|
#
|
||||||
# This library is free software. Distribution and use rights are outlined in
|
# This library is free software. Distribution and use rights are outlined in
|
||||||
# the file "COPYING" which should have been included with this file. If this
|
# the file "COPYING" which should have been included with this file. If this
|
||||||
|
|
Loading…
Reference in New Issue