From 2413d114b702f23427fe7cffc7e1529693e50e01 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 20 Jan 2013 13:58:53 +0000 Subject: Upgrade Doxygen configuration files to the latest version. --- LUFA/Doxygen.conf | 23 ++++++++++++++--------- LUFA/StudioIntegration/makefile | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) (limited to 'LUFA') diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf index 38dbcd0af..e8d5e5c8d 100644 --- a/LUFA/Doxygen.conf +++ b/LUFA/Doxygen.conf @@ -1,4 +1,4 @@ -# Doxyfile 1.8.3 +# Doxyfile 1.8.3.1 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -1285,14 +1285,19 @@ SEARCHENGINE_URL = SEARCHDATA_FILE = searchdata.xml -# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through other -# doxygen projects that are not otherwise connected via tags files, but are -# all added to the same search index. Each project needs to have a tag file set -# via GENERATE_TAGFILE. The search mapping then maps the name of the tag file -# to a relative location where the documentation can be found, -# similar to the -# TAGFILES option but without actually processing the tag file. -# The format is: EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... +# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id +# of to a relative location where the documentation can be found. +# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ... EXTRA_SEARCH_MAPPINGS = diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile index 3de50c440..f5fdbfdf4 100644 --- a/LUFA/StudioIntegration/makefile +++ b/LUFA/StudioIntegration/makefile @@ -24,7 +24,7 @@ clean: @rm $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML) $(DOXYGEN_TAG_FILE_XML): - make -C ../ doxygen + $(MAKE) -C ../ doxygen $(TEMP_MANIFEST_XML): $(DOXYGEN_TAG_FILE_XML) @echo "Generating Manifest XML..." -- cgit v1.2.3