Changeset 3966 for trunk/doc


Ignore:
Timestamp:
Aug 11, 2020, 4:54:36 AM (10 months ago)
Author:
Peter
Message:

merge changes in 0.17-stable branch (since 0.17.1) into trunk.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/doc/Makefile.am

    r3018 r3966  
    4141
    4242if DX_ENABLE_HTML
    43 html-local: doc/$(DX_HTML_OUTPUT)/index.html
     43html-local: doc/html/index.html
    4444INSTALL_CHECK_TARGETS += installcheck-html
    4545endif
    4646
    47 doc/$(DX_HTML_OUTPUT)/index.html: $(DOXYGEN_DEPS)
    48   $(AM_V_GEN)
    49   $(AM_V_at){ cat doc/doxygen.config && \
    50   echo "INPUT = $(DOXYGEN_INPUT)" && \
    51   echo GENERATE_HTML = YES; } | $(DOXYGEN) - $(yat_dev_null);
     47doc/doxygen.config: doc/doxygen.config.in
     48  $(AM_V_GEN)echo "# $@ generated by make from doc/doxygen.config.in." \
     49  > $@-t \
     50  && $(edit) '$(srcdir)/doc/doxygen.config.in' >> $@-t \
     51  && echo "INPUT = $(DOXYGEN_INPUT)" >> $@-t \
     52  && mv $@-t $@
     53
     54doc/html/index.html: $(DOXYGEN_DEPS)
     55  $(AM_V_GEN)$(DOXYGEN) doc/doxygen.config $(yat_dev_null)
     56
    5257
    5358install-data-hook: install-html
  • trunk/doc/doxygen.config.in

    r3964 r3966  
    1 # @configure_input@
    21# $Id$
    32
     
    464463# generate HTML output.
    465464
    466 GENERATE_HTML          = NO
     465GENERATE_HTML          = YES
    467466
    468467# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
     
    470469# put in front of it. If left blank `html' will be used as the default path.
    471470
    472 HTML_OUTPUT            = @DX_HTML_OUTPUT@
     471HTML_OUTPUT            = html
    473472
    474473# The HTML_HEADER tag can be used to specify a personal HTML header for
     
    482481# standard footer.
    483482
    484 HTML_FOOTER            = @abs_srcdir@/footer.html
     483HTML_FOOTER            = @abs_top_srcdir@/doc/footer.html
    485484
    486485# The HTML_STYLESHEET tag can be used to specify a user defined cascading
Note: See TracChangeset for help on using the changeset viewer.