Move Doxyfile files to docs and associated makefile. This is a prelude to allowing a docs directory for all the RST files as well as expanding the makefile to build the docs for those too, not just the doxygen output.
The doxygen html has been moved to build/docs/html so it's not in a source directory.
Gitignore has been fixed to allow files in docs now without complaining.
BUG=
R=stichnot@chromium.org
Review URL: https://codereview.chromium.org/1562703002 .
Patch from Reed Kotler <rkotlerimgtec@gmail.com>.
diff --git a/.gitignore b/.gitignore
index 6c5964a..062ad19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,4 @@
# Ignore specific patterns at the top-level directory
/pnacl-sz
/build/
-/docs/html/
/crosstest/Output/
diff --git a/Makefile.standalone b/Makefile.standalone
index 402a9d0..64796c9 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -510,11 +510,10 @@
@echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html
docs:
- doxygen Doxyfile
- @echo See file://`pwd`/docs/html/index.html
+ make -C docs -f Makefile.standalone
clean:
rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
clean-all: clean
- rm -rf build/ docs/html
+ rm -rf build/ crosstest/Output/
diff --git a/Doxyfile b/docs/Doxyfile
similarity index 99%
rename from Doxyfile
rename to docs/Doxyfile
index 0fec183..14531c7 100644
--- a/Doxyfile
+++ b/docs/Doxyfile
@@ -58,7 +58,7 @@
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = "docs"
+OUTPUT_DIRECTORY = "../build/docs"
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
# directories (in 2 levels) under the output directory of each output format and
@@ -743,13 +743,13 @@
# spaces.
# Note: If this tag is empty the current directory is searched.
-INPUT = "src" \
- "../llvm/include/llvm/ADT" \
- "../llvm/include/llvm/Bitcode" \
- "../llvm/include/llvm/Config" \
- "../llvm/include/llvm/IR" \
- "../llvm/include/llvm/IRReader" \
- "../llvm/include/llvm/Support"
+INPUT = "../src" \
+ "../../llvm/include/llvm/ADT" \
+ "../../llvm/include/llvm/Bitcode" \
+ "../../llvm/include/llvm/Config" \
+ "../../llvm/include/llvm/IR" \
+ "../../llvm/include/llvm/IRReader" \
+ "../../llvm/include/llvm/Support"
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/docs/Makefile.standalone b/docs/Makefile.standalone
new file mode 100644
index 0000000..a0e3748
--- /dev/null
+++ b/docs/Makefile.standalone
@@ -0,0 +1,5 @@
+.PHONY: all
+
+all:
+ doxygen Doxyfile
+ @echo See file://`pwd`/../build/docs/html/index.html
