diff options
author | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-21 08:09:22 -0800 |
---|---|---|
committer | Chase Douglas <chase.douglas@ubuntu.com> | 2011-12-21 08:09:22 -0800 |
commit | e5f21a67393a5db4d91f07f87a649ec38d27fcc7 (patch) | |
tree | 8c7e99e82339eb42ec7a5ff54a4c96019b02c020 | |
parent | 739e52c343cdd412c0c4e9e21dd79be25b3027ca (diff) |
Use "make doc" to build all documentation
And clean up doc/Makefile.am targets.
-rw-r--r-- | Makefile.am | 3 | ||||
-rw-r--r-- | doc/Makefile.am | 16 |
2 files changed, 4 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index b79c16c..d10bca8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,8 @@ AM_CXXFLAGS = -Iinclude INSTALL: $(INSTALL_CMD) -doc-%: +.PHONY: doc +doc: $(MAKE) -C doc $@ dist-hook: ChangeLog INSTALL diff --git a/doc/Makefile.am b/doc/Makefile.am index aa75905..f4f5fc0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -24,20 +24,8 @@ EXTRA_DIST = \ Doxyfile -doc-html: doc-html-doxygen - -doc-man: doc-man-doxygen - -doc-pdf: doc-pdf-doxygen - -doc-html-doxygen: - doxygen - -doc-man-doxygen: - doxygen - -doc-pdf-doxygen: - doxygen +doc: + doxygen install-data-local: if [ -d api/html ]; then \ |