From 0878b7f5136faa332ef9899e4e27ae6a4fb5fe9c Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Mon, 15 Apr 2013 23:47:13 +0900 Subject: [PATCH] Adapt documentation creation and installation code. --- Makefile.am | 21 +++++++++++++-------- doc/Doxyfile | 4 ++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index d512c8c..75459cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,9 +34,13 @@ docdir = ${datadir}/doc/${PACKAGE} #EXTRA_DIST = autogen.sh \ # gammalib.pc.in -install-data-local: $(HTML_INSTALL_DATA_TARGETS) +#install-data-local: $(HTML_INSTALL_DATA_TARGETS) +# +#uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS) + +install-data-local: doxygen-install -uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS) +uninstall-local: doxygen-uninstall # @@ -99,7 +103,7 @@ valgrind: # Add Sphinx rule sphinx: @if type sphinx-build >/dev/null 2>&1; then \ - sphinx-build -b html doc/source doc/build; \ + sphinx-build -b html doc/source doc/html; \ else \ echo "sphinx-build not found in PATH."; \ fi @@ -214,8 +218,9 @@ doxygen-uninstall: done @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) - rm -rf @DX_DOCDIR@ - $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) + rm -rf @DX_DOCDIR@ + mkdir -p $(srcdir)/doc/html/doxygen + $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) DX_CLEANFILES = \ @DX_DOCDIR@/@PACKAGE@.tag \ @@ -236,9 +241,9 @@ endif #DX_COND_doc HTMLDIRS = html html/images HTML_INSTALL_DATA_TARGETS = install-data-html install-data-html: - $(mkinstalldirs) $(DESTDIR)$(docdir)/html/doxygen - $(INSTALL_DATA) $(srcdir)/doc/html/doxygen.html $(DESTDIR)$(docdir)/html/doxygen/index.html - $(INSTALL_DATA) $(srcdir)/doc/html/gammalib.css $(DESTDIR)$(docdir)/html/doxygen + #$(mkinstalldirs) $(DESTDIR)$(docdir)/html/doxygen + #$(INSTALL_DATA) $(srcdir)/doc/html/doxygen.html $(DESTDIR)$(docdir)/html/doxygen/index.html + #$(INSTALL_DATA) $(srcdir)/doc/html/gammalib.css $(DESTDIR)$(docdir)/html/doxygen @for dir in $(HTMLDIRS) ; do \ $(mkinstalldirs) $(DESTDIR)$(docdir)/$$dir && \ for file in $(srcdir)/doc/$$dir/*.* ; do \ diff --git a/doc/Doxyfile b/doc/Doxyfile index c651964..03fb54a 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -52,7 +52,7 @@ PROJECT_LOGO = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = doc/build +OUTPUT_DIRECTORY = doc # 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 @@ -871,7 +871,7 @@ GENERATE_HTML = YES # If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. -HTML_OUTPUT = doxygen +HTML_OUTPUT = html/doxygen # The HTML_FILE_EXTENSION tag can be used to specify the file extension for # each generated HTML page (for example: .htm,.php,.asp). If it is left blank -- libgit2 0.21.4