Changeset 1582


Ignore:
Timestamp:
Jul 28, 2010 10:53:11 AM (9 years ago)
Author:
lou
Message:

Add forgotten doxydoc targets. But don't build doxydoc by default; breaks
nightly build.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.am

    r1579 r1582  
    8383unitTest: test
    8484
    85 clean-local:
     85# Doxygen documentation
     86
     87doxydoc:
     88        doxygen doxydoc/doxygen.conf
     89
     90clean-doxydoc:
     91        ( cd doxydoc ; rm -rf html *.log *.tag )
     92
     93
     94clean-local: clean-doxydoc
    8695        if test -r test/Makefile; then cd test; $(MAKE) clean; fi
    8796
     
    93102uninstall-local: uninstall-doc
    94103
    95 .PHONY: test unitTest
     104.PHONY: test unitTest doxydoc
    96105
    97106########################################################################
  • trunk/Clp/Makefile.in

    r1581 r1582  
    819819unitTest: test
    820820
    821 clean-local:
     821# Doxygen documentation
     822
     823doxydoc:
     824        doxygen doxydoc/doxygen.conf
     825
     826clean-doxydoc:
     827        ( cd doxydoc ; rm -rf html *.log *.tag )
     828
     829clean-local: clean-doxydoc
    822830        if test -r test/Makefile; then cd test; $(MAKE) clean; fi
    823831
     
    829837uninstall-local: uninstall-doc
    830838
    831 .PHONY: test unitTest
     839.PHONY: test unitTest doxydoc
    832840
    833841@COIN_HAS_PKGCONFIG_TRUE@install-data-hook:
  • trunk/Makefile.am

    r1572 r1582  
    3737unitTests: tests
    3838
     39# Generate doxygen doc'n in subdirectories (except @PACKAGE_NAME@) if a doxydoc
     40# directory is present, then do the base, if present.
     41
    3942doxydoc:
    40         cd $(srcdir); doxygen doxydoc/doxygen.conf
     43        for dir in $(subdirs) ; do \
     44          if test $$dir != @PACKAGE_NAME@ && test -r $$dir/doxydoc ; then \
     45            (cd $$dir ; $(MAKE) doxydoc) \
     46          fi ; \
     47        done ; \
     48        if test -r doxydoc/doxygen.conf ; then \
     49          doxygen doxydoc/doxygen.conf ; \
     50        fi
     51
     52clean-doxydoc:
     53        ( cd doxydoc ; rm -rf html *.log *.tag )
     54
     55# DocInstallDir is defined in Makemain.inc and is specific to the package.
     56# For the short term, adopt the notion that we install only the package
     57# doxydoc.
     58
     59install-doxydoc: doxydoc
     60        if test -r doxydoc/doxygen.conf ; then \
     61          $(mkdir_p) $(DocInstallDir) ; \
     62          cp -R doxydoc $(DocInstallDir) ; \
     63        fi
     64
     65uninstall-doxydoc:
     66        rm -rf $(DocInstallDir)/doxydoc
     67
     68clean-local: clean-doxydoc
     69# install-data-local: install-doxydoc
     70uninstall-local: uninstall-doxydoc
    4171
    4272.PHONY: test unitTest tests unitTests doxydoc
  • trunk/Makefile.in

    r1581 r1582  
    613613clean: clean-recursive
    614614
    615 clean-am: clean-generic clean-libtool mostlyclean-am
     615clean-am: clean-generic clean-libtool clean-local mostlyclean-am
    616616
    617617distclean: distclean-recursive
     
    659659ps-am:
    660660
    661 uninstall-am: uninstall-info-am
     661uninstall-am: uninstall-info-am uninstall-local
    662662
    663663uninstall-info: uninstall-info-recursive
    664664
    665665.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
    666         check-am clean clean-generic clean-libtool clean-recursive \
    667         ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
    668         dist-shar dist-tarZ dist-zip distcheck distclean \
     666        check-am clean clean-generic clean-libtool clean-local \
     667        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
     668        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
    669669        distclean-generic distclean-libtool distclean-recursive \
    670670        distclean-tags distcleancheck distdir distuninstallcheck dvi \
     
    676676        maintainer-clean-recursive mostlyclean mostlyclean-generic \
    677677        mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    678         tags tags-recursive uninstall uninstall-am uninstall-info-am
     678        tags tags-recursive uninstall uninstall-am uninstall-info-am \
     679        uninstall-local
    679680
    680681
     
    697698unitTests: tests
    698699
     700# Generate doxygen doc'n in subdirectories (except @PACKAGE_NAME@) if a doxydoc
     701# directory is present, then do the base, if present.
     702
    699703doxydoc:
    700         cd $(srcdir); doxygen doxydoc/doxygen.conf
     704        for dir in $(subdirs) ; do \
     705          if test $$dir != @PACKAGE_NAME@ && test -r $$dir/doxydoc ; then \
     706            (cd $$dir ; $(MAKE) doxydoc) \
     707          fi ; \
     708        done ; \
     709        if test -r doxydoc/doxygen.conf ; then \
     710          doxygen doxydoc/doxygen.conf ; \
     711        fi
     712
     713clean-doxydoc:
     714        ( cd doxydoc ; rm -rf html *.log *.tag )
     715
     716# DocInstallDir is defined in Makemain.inc and is specific to the package.
     717# For the short term, adopt the notion that we install only the package
     718# doxydoc.
     719
     720install-doxydoc: doxydoc
     721        if test -r doxydoc/doxygen.conf ; then \
     722          $(mkdir_p) $(DocInstallDir) ; \
     723          cp -R doxydoc $(DocInstallDir) ; \
     724        fi
     725
     726uninstall-doxydoc:
     727        rm -rf $(DocInstallDir)/doxydoc
     728
     729clean-local: clean-doxydoc
     730# install-data-local: install-doxydoc
     731uninstall-local: uninstall-doxydoc
    701732
    702733.PHONY: test unitTest tests unitTests doxydoc
Note: See TracChangeset for help on using the changeset viewer.