Ignore:
Timestamp:
Feb 12, 2016 4:04:58 PM (5 years ago)
Author:
tkr
Message:

temporarily committing release candidate

Location:
stable/1.16
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.16

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.0/
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
        5 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
        6 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.5
        7 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.8.6/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.3.5/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.4/
         4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.5.4/
         5ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.4/
         6ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.5.4/
         7ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.4/
        88Data/Netlib  https://projects.coin-or.org/svn/Data/Netlib/releases/1.2.6/
        99Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.10/
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.10/CoinUtils
        11 Osi  https://projects.coin-or.org/svn/Osi/stable/0.107/Osi
        12 
        13 
        14 
        15 
        16 
        17 
        18 
        19 
        20 
        21 
         10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.10.13/CoinUtils
         11Osi  https://projects.coin-or.org/svn/Osi/releases/0.107.7/Osi
  • stable/1.16/Clp/Makefile.in

    r2207 r2208  
    187187COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    188188COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     189COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
     190COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
    189191COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
    190192COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
     193COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
     194COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    191195COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
    192196COIN_HAS_MUMPS_TRUE = @COIN_HAS_MUMPS_TRUE@
     
    353357coin_doxy_usedot = @coin_doxy_usedot@
    354358coin_have_doxygen = @coin_have_doxygen@
     359coin_have_latex = @coin_have_latex@
    355360datadir = @datadir@
    356361exec_prefix = @exec_prefix@
     
    425430# Files that are generated and should be cleaned with make distclean
    426431DISTCLEANFILES = $(am__append_5) $(VPATH_DISTCLEANFILES)
    427 DocFiles = README AUTHORS LICENSE
     432DocFiles = README AUTHORS LICENSE 
    428433DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     434COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
     435COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    429436all: all-recursive
    430437
     
    926933        rm -f $(addlibsdir)/clp_addlibs.txt
    927934
    928 install-doc: $(DocFiles)
     935doxygen-docs:
     936        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     937          if test -d "doxydoc/"; then \
     938            doxygen doxydoc/doxygen.conf;\
     939          fi;\
     940        fi
     941
     942pdf-doxygen-docs: doxygen-docs
     943        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     944          if test -d "doxydoc/latex"; then \
     945            if test "$(COIN_HAS_LATEX)" = TRUE; then \
     946              cd doxydoc/latex;\
     947              $(MAKE) pdf;\
     948              cd -;\
     949            fi;\
     950          fi;\
     951        fi
     952
     953clean-doxygen-docs:
     954        if test -d "doxydoc/"; then \
     955          cd doxydoc ;\
     956          rm -rf html latex *.log *.tag;\
     957        fi
     958
     959install-doxygen-docs: doxygen-docs
     960        if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
     961          if test -d "doxydoc/"; then \
     962            test -d "$(DESTDIR)$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
     963            $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
     964            if test -f "doxydoc/latex/refman.pdf"; then \
     965              $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
     966            fi;\
     967            if test -d "doxydoc/html"; then \
     968              test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
     969              $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
     970              $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
     971            fi;\
     972          fi;\
     973        fi
     974
     975uninstall-doxygen-docs:
     976        if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
     977          rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
     978        fi
     979        if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
     980          rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
     981        fi
     982
     983all-doxygen-docs:
     984        for dir in $(subdirs) ; do \
     985          do_project=true;\
     986          for proj in $(COIN_SKIP_DOXYGEN); do\
     987            if test $$dir = $$proj; then\
     988              do_project=false;\
     989            fi;\
     990          done;\
     991          if test -r $$dir/doxydoc & $$do_project = true; then \
     992            (cd $$dir ; $(MAKE) doxygen-docs) \
     993          fi ; \
     994        done ;
     995
     996clean-all-doxygen-docs:
     997        for dir in $(subdirs) ; do \
     998          if test -r $$dir/doxydoc ; then \
     999            (cd $$dir ; $(MAKE) clean-doxygen-docs) \
     1000          fi ; \
     1001        done ;
     1002
     1003install-all-doxygen-docs: all-doxygen-docs
     1004        for dir in $(subdirs) ; do \
     1005          do_project=true;\
     1006          for proj in $(COIN_SKIP_DOXYGEN); do\
     1007            if test $$dir = $$proj; then\
     1008              do_project=false;\
     1009            fi;\
     1010          done;\
     1011          if test -r $$dir/doxydoc & $$do_project = true; then \
     1012            (cd $$dir ; $(MAKE) install-doxygen-docs) \
     1013          fi ; \
     1014        done ;
     1015
     1016uninstall-all-doxygen-docs:
     1017        for dir in $(subdirs) ; do \
     1018          if test -r $$dir/doxydoc ; then \
     1019            (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
     1020          fi ; \
     1021        done ;
     1022
     1023install-doc: $(DocFiles)
    9291024        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    9301025        for file in $(DocFiles); do \
    9311026          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    9321027          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    933         done
     1028        done 
    9341029
    9351030uninstall-doc:
Note: See TracChangeset for help on using the changeset viewer.