Mercurial > octave

diff doc/module.mk @ 21298:31cd45258fc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Fix doxygen build system integration * doc/module.mk (doxyhtml): Add Doxyfile as a prerequisite. (doxyhtml-maintainer-clean): Simplify rule to clean doxyhtml directory. * Doxyfile.in (PROJECT_LOGO): Use correct path to icon. (STRIP_FROM_PATH, INCLUDE_PATH, INPUT, EXAMPLE_PATH): Use abs_top_srcdir. (PREDEFINED): Add HAVE_OPENGL and HAVE_QSCINTILLA to the list, sort.
author Mike Miller <mtmiller@octave.org>
date Thu, 18 Feb 2016 12:10:34 -0800
parents 1309edb344e1
children 2f9de06a526e
line wrap: on
line diff
--- a/doc/module.mk	Thu Feb 18 15:10:36 2016 -0500
+++ b/doc/module.mk	Thu Feb 18 12:10:34 2016 -0800
@@ -51,13 +51,12 @@
   doc/doxyhtml/Doxyfile.in \
   doc/doxyhtml/README
 
-doxyhtml: | doc/doxyhtml/$(octave_dirstamp)
+doxyhtml: doc/doxyhtml/Doxyfile | doc/doxyhtml/$(octave_dirstamp)
 	doxygen doc/doxyhtml/Doxyfile
 
 doxyhtml-maintainer-clean:
 	rm -f doc/doxygen_sqlite3.db
-	cd doc/doxyhtml && \
-	rm -rf `ls | $(GREP) -v Doxyfile.in | $(GREP) -v README`
+	rm -rf `ls -d doc/doxyhtml/* 2>/dev/null | $(GREP) -v 'Doxyfile\.in\|README'`
 
 DIRSTAMP_FILES += doc/doxyhtml/$(octave_dirstamp)