Changeset 2171 for releases/2.9.0


Ignore:
Timestamp:
Mar 21, 2015 12:13:50 AM (3 years ago)
Author:
tkr
Message:

Reverse merging accidental commit to release

File:
1 edited

Legend:

Unmodified
Added
Removed
  • releases/2.9.0/Cbc/Makefile.in

    r2170 r2171  
    182182COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    183183COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    184 COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
    185 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
    186184COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    187185COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
     
    190188COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
    191189COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
    192 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
    193 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
    194190COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
    195191COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
     
    411407coin_doxy_usedot = @coin_doxy_usedot@
    412408coin_have_doxygen = @coin_have_doxygen@
    413 coin_have_latex = @coin_have_latex@
    414409datadir = @datadir@
    415410exec_prefix = @exec_prefix@
     
    493488# Files that are generated and should be cleaned with make distclean
    494489DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    495 DocFiles = README AUTHORS LICENSE 
     490DocFiles = README AUTHORS LICENSE
    496491DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
    497 COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE
    498 COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE
    499492all: all-recursive
    500493
     
    996989        rm -f $(addlibsdir)/cbc_addlibs.txt
    997990
    998 doxygen-docs:
    999         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    1000           if test -d "doxydoc/"; then \
    1001             doxygen doxydoc/doxygen.conf;\
    1002           fi;\
    1003           if test -d "doxydoc/latex"; then \
    1004             if test "$(COIN_HAS_LATEX)" = TRUE; then \
    1005               cd doxydoc/latex;\
    1006               $(MAKE) pdf;\
    1007               cd -;\
    1008             fi;\
    1009           fi;\
    1010         fi
    1011 
    1012 clean-doxygen-docs:
    1013         if test -d "doxydoc/"; then \
    1014           cd doxydoc ;\
    1015           rm -rf html latex *.log *.tag;\
    1016         fi
    1017 
    1018 install-doxygen-docs: doxygen-docs
    1019         if test "$(COIN_HAS_DOXYGEN)" = TRUE; then \
    1020           if test -d "doxydoc/"; then \
    1021             $(INSTALL_DATA) @coin_doxy_tagname@ "$(DESTDIR)$(DocInstallDir)/@coin_doxy_tagname@";\
    1022             test -d "$(DocInstallDir)/doxydoc" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc"; \
    1023             if test -f "doxydoc/latex/refman.pdf"; then \
    1024               $(INSTALL_DATA) doxydoc/latex/refman.pdf "$(DESTDIR)$(DocInstallDir)";\
    1025             fi;\
    1026             if test -d "doxydoc/html"; then \
    1027               test -d "$(DocInstallDir)/doxydoc/search/" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)/doxydoc/search/"; \
    1028               $(INSTALL_DATA) doxydoc/html/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc";\
    1029               $(INSTALL_DATA) doxydoc/html/search/*.* "$(DESTDIR)$(DocInstallDir)/doxydoc/search";\
    1030             fi;\
    1031           fi;\
    1032         fi
    1033 
    1034 uninstall-doxygen-docs:
    1035         if test -d "$(DESTDIR)$(DocInstallDir)/doxydoc/"; then \
    1036           rm -rf "$(DESTDIR)$(DocInstallDir)/doxydoc/"; \
    1037         fi
    1038         if test -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; then \
    1039           rm -f "$(DESTDIR)$(DocInstallDir)/refman.pdf"; \
    1040         fi
    1041 
    1042 all-doxygen-docs:
    1043         for dir in $(subdirs) ; do \
    1044           do_project=true;\
    1045           for proj in $(COIN_SKIP_DOXYGEN); do\
    1046             if test $$dir = $$proj; then\
    1047               do_project=false;\
    1048             fi;\
    1049           done;\
    1050           if test -r $$dir/doxydoc & $$do_project = true; then \
    1051             (cd $$dir ; $(MAKE) doxygen-docs) \
    1052           fi ; \
    1053         done ;
    1054 
    1055 clean-all-doxygen-docs:
    1056         for dir in $(subdirs) ; do \
    1057           if test -r $$dir/doxydoc ; then \
    1058             (cd $$dir ; $(MAKE) clean-doxygen-docs) \
    1059           fi ; \
    1060         done ;
    1061 
    1062 install-all-doxygen-docs: all-doxygen-docs
    1063         for dir in $(subdirs) ; do \
    1064           do_project=true;\
    1065           for proj in $(COIN_SKIP_DOXYGEN); do\
    1066             if test $$dir = $$proj; then\
    1067               do_project=false;\
    1068             fi;\
    1069           done;\
    1070           if test -r $$dir/doxydoc & $$do_project = true; then \
    1071             (cd $$dir ; $(MAKE) install-doxygen-docs) \
    1072           fi ; \
    1073         done ;
    1074 
    1075 uninstall-all-doxygen-docs:
    1076         for dir in $(subdirs) ; do \
    1077           if test -r $$dir/doxydoc ; then \
    1078             (cd $$dir ; $(MAKE) uninstall-doxygen-docs) \
    1079           fi ; \
    1080         done ;
    1081 
    1082 install-doc: $(DocFiles)
     991install-doc: $(DocFiles)
    1083992        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    1084993        for file in $(DocFiles); do \
    1085994          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
    1086995          if test -f "$$dir$$file"; then $(INSTALL_DATA) "$$dir$$file" "$(DESTDIR)$(DocInstallDir)/$$file"; fi; \
    1087         done 
     996        done
    1088997
    1089998uninstall-doc:
Note: See TracChangeset for help on using the changeset viewer.