Pierrick Martin / gammalib

Commit 0878b7f5136faa332ef9899e4e27ae6a4fb5fe9c

Authored by Jürgen Knödlseder
1 parent 4a8679c0

Adapt documentation creation and installation code. 

Note that the Sphinx documentation deployment is still missing.
Inline Side-by-side
Showing 2 changed files with 15 additions and 10 deletions
Makefile.am
  View file @0878b7f
@@ -34,9 +34,13 @@ docdir = ${datadir}/doc/${PACKAGE} @@ -34,9 +34,13 @@ docdir = ${datadir}/doc/${PACKAGE}
34 #EXTRA_DIST = autogen.sh \ 34 #EXTRA_DIST = autogen.sh \
35 # gammalib.pc.in 35 # gammalib.pc.in
36 36
37 -install-data-local: $(HTML_INSTALL_DATA_TARGETS) 37 +#install-data-local: $(HTML_INSTALL_DATA_TARGETS)
  38 +#
  39 +#uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS)
  40 +
  41 +install-data-local: doxygen-install
38 42
39 -uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS) 43 +uninstall-local: doxygen-uninstall
40 44
41 45
42 # 46 #
@@ -99,7 +103,7 @@ valgrind: @@ -99,7 +103,7 @@ valgrind:
99 # Add Sphinx rule 103 # Add Sphinx rule
100 sphinx: 104 sphinx:
101 @if type sphinx-build >/dev/null 2>&1; then \ 105 @if type sphinx-build >/dev/null 2>&1; then \
102 - sphinx-build -b html doc/source doc/build; \ 106 + sphinx-build -b html doc/source doc/html; \
103 else \ 107 else \
104 echo "sphinx-build not found in PATH."; \ 108 echo "sphinx-build not found in PATH."; \
105 fi 109 fi
@@ -214,8 +218,9 @@ doxygen-uninstall: @@ -214,8 +218,9 @@ doxygen-uninstall:
214 done 218 done
215 219
216 @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) 220 @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
217 - rm -rf @DX_DOCDIR@  
218 - $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) 221 + rm -rf @DX_DOCDIR@
  222 + mkdir -p $(srcdir)/doc/html/doxygen
  223 + $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
219 224
220 DX_CLEANFILES = \ 225 DX_CLEANFILES = \
221 @DX_DOCDIR@/@PACKAGE@.tag \ 226 @DX_DOCDIR@/@PACKAGE@.tag \
@@ -236,9 +241,9 @@ endif #DX_COND_doc @@ -236,9 +241,9 @@ endif #DX_COND_doc
236 HTMLDIRS = html html/images 241 HTMLDIRS = html html/images
237 HTML_INSTALL_DATA_TARGETS = install-data-html 242 HTML_INSTALL_DATA_TARGETS = install-data-html
238 install-data-html: 243 install-data-html:
239 - $(mkinstalldirs) $(DESTDIR)$(docdir)/html/doxygen  
240 - $(INSTALL_DATA) $(srcdir)/doc/html/doxygen.html $(DESTDIR)$(docdir)/html/doxygen/index.html  
241 - $(INSTALL_DATA) $(srcdir)/doc/html/gammalib.css $(DESTDIR)$(docdir)/html/doxygen 244 + #$(mkinstalldirs) $(DESTDIR)$(docdir)/html/doxygen
  245 + #$(INSTALL_DATA) $(srcdir)/doc/html/doxygen.html $(DESTDIR)$(docdir)/html/doxygen/index.html
  246 + #$(INSTALL_DATA) $(srcdir)/doc/html/gammalib.css $(DESTDIR)$(docdir)/html/doxygen
242 @for dir in $(HTMLDIRS) ; do \ 247 @for dir in $(HTMLDIRS) ; do \
243 $(mkinstalldirs) $(DESTDIR)$(docdir)/$$dir && \ 248 $(mkinstalldirs) $(DESTDIR)$(docdir)/$$dir && \
244 for file in $(srcdir)/doc/$$dir/*.* ; do \ 249 for file in $(srcdir)/doc/$$dir/*.* ; do \
doc/Doxyfile
  View file @0878b7f
@@ -52,7 +52,7 @@ PROJECT_LOGO = @@ -52,7 +52,7 @@ PROJECT_LOGO =
52 # If a relative path is entered, it will be relative to the location 52 # If a relative path is entered, it will be relative to the location
53 # where doxygen was started. If left blank the current directory will be used. 53 # where doxygen was started. If left blank the current directory will be used.
54 54
55 -OUTPUT_DIRECTORY = doc/build 55 +OUTPUT_DIRECTORY = doc
56 56
57 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 57 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
58 # 4096 sub-directories (in 2 levels) under the output directory of each output 58 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -871,7 +871,7 @@ GENERATE_HTML = YES @@ -871,7 +871,7 @@ GENERATE_HTML = YES
871 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 871 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
872 # put in front of it. If left blank `html' will be used as the default path. 872 # put in front of it. If left blank `html' will be used as the default path.
873 873
874 -HTML_OUTPUT = doxygen 874 +HTML_OUTPUT = html/doxygen
875 875
876 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 876 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for
877 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 877 # each generated HTML page (for example: .htm,.php,.asp). If it is left blank