COIN-OR::LEMON - Graph Library

Changeset 60:6ec5dbed8f18 in lemon for doc


Ignore:
Timestamp:
01/23/08 16:26:41 (16 years ago)
Author:
Akos Ladanyi <ladanyi@…>
Branch:
default
Children:
61:d718974f1290, 62:4790635473ef, 96:b55e501a90ee
Phase:
public
Message:

Reworked documentation generation and installation.
Details:

  • Remove configure flag used to disable the automatic generation of the documentation when istalling.
  • Now 'make html' generates the documentation.
  • Now 'make install' does not install the documentation, 'make install-html' does that. The latter two changes follow newer automake conventions.
  • This also fixes the bug that caused the documentation missing from the tarball.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/Makefile.am

    r56 r60  
    1 htmldir = $(datadir)/doc/$(PACKAGE)/html
    2 
    31EXTRA_DIST += \
    42        doc/Makefile \
    5         doc/Doxyfile.in
     3        doc/Doxyfile.in \
     4        doc/coding_style.dox \
     5        doc/dirs.dox \
     6        doc/groups.dox \
     7        doc/license.dox \
     8        doc/mainpage.dox \
     9        doc/namespaces.dox \
     10        doc/html
    611
    7 doc:
     12doc/html:
     13        $(MAKE) $(AM_MAKEFLAGS) html
     14
     15html-local:
    816        if test ${doxygen_found} = yes; then \
    917          cd doc; \
    1018          doxygen Doxyfile; \
    1119          cd ..; \
    12         fi
    13 
    14 doc-clean:
    15         if test ${doxygen_found} = yes; then \
    16           rm -rf doc/html; \
    17           rm -f doc/doxygen.log; \
    18           cd doc; \
    19           doxygen Doxyfile; \
    20           cd ..; \
     20        else \
     21          echo; \
     22          echo "Doxygen not found."; \
     23          echo; \
     24          exit 1; \
    2125        fi
    2226
     
    2529        -rm -f doc/doxygen.log
    2630
    27 doc/html:
    28         $(MAKE) $(AM_MAKEFLAGS) doc-clean
    29 
    3031update-external-tags:
    3132        wget -O doc/libstdc++.tag.tmp http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag && \
     
    3334        rm doc/libstdc++.tag.tmp
    3435
    35 if WANT_DOC
    36 
    37 install-data-local: doc/html
     36install-html-local: doc/html
    3837        @$(NORMAL_INSTALL)
    39         $(mkinstalldirs) $(DESTDIR)$(htmldir)
    40         @dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
     38        $(mkinstalldirs) $(DESTDIR)$(htmldir)/docs
     39        for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    4140          f="`echo $$p | sed -e 's|^.*/||'`"; \
    42           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
    43           $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
     41          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f"; \
     42          $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/docs/$$f; \
    4443        done
    4544
    46 uninstall-local: doc/html
     45uninstall-local:
    4746        @$(NORMAL_UNINSTALL)
    48         @dir='doc/html'; shopt -s nullglob; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.gif $$dir/*.dot $$dir/*.php $$dir/*.idx $$dir/*.tag ; do \
     47        for p in doc/html/*.{html,css,png,map,gif,tag} ; do \
    4948          f="`echo $$p | sed -e 's|^.*/||'`"; \
    50           echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
    51           rm -f $(DESTDIR)$(htmldir)/$$f; \
     49          echo " rm -f $(DESTDIR)$(htmldir)/docs/$$f"; \
     50          rm -f $(DESTDIR)$(htmldir)/docs/$$f; \
    5251        done
    5352
    54 endif WANT_DOC
    55 
    56 .PHONY: doc doc-clean
     53.PHONY: update-external-tags
Note: See TracChangeset for help on using the changeset viewer.