tor

commit 8413eec2c74fc518d3cbffc6deb9ae57eaea2a27
parent bcbf3b7479703a94c6786e577ab05708ff62f6d4
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 16 Oct 2019 10:28:03 -0400

Merge branch 'ticket32099'

Diffstat:
M
Doxyfile.in
 | 
2
+-
M
Makefile.am
 | 
5
+++--
A
changes/ticket32099
 | 
4
++++

3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Doxyfile.in b/Doxyfile.in
@@ -1645,7 +1645,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
diff --git a/Makefile.am b/Makefile.am
@@ -236,8 +236,9 @@ dist-rpm: dist-gzip
 	echo "RPM build finished";						\
 	#end of dist-rpm
 
-doxygen:
-	doxygen && cd doc/doxygen/latex && make
+.PHONY: doxygen
+doxygen: Doxyfile
+	doxygen
 
 test: all
 	$(top_builddir)/src/test/test
diff --git a/changes/ticket32099 b/changes/ticket32099
@@ -0,0 +1,4 @@
+  o Removed features:
+    - Our Doxygen configuration no longer generates LaTeX output.  The
+      reference manual produced by doing this was over 4000 pages long,
+      and generally unusable.  Closes ticket 32099.