Changeset 2297
- Timestamp:
- Jul 12, 2010, 3:22:39 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 6 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEWS
r2257 r2297 4 4 5 5 version 0.7 (released DATE) 6 - dvi, ps and pdf docs are no longer generated 6 7 - utility::load functions now work with std::string as well. 7 8 -
trunk/configure.ac
r2266 r2297 85 85 86 86 have_doxygen=no 87 dx_enable_latex=no88 dx_enable_dvi=no89 dx_enable_ps=no90 dx_enable_pdf=no91 87 AC_PATH_PROG([DOXYGEN], [doxygen], [no]) 92 88 if test "$DOXYGEN" = "no"; then … … 99 95 [have_doxygen=yes]) 100 96 AC_MSG_RESULT([$doxygen_version]) 101 dx_enable_latex=yes 102 # doxygen 1.5.8 has a bug for latex output and enums 103 AS_IF([test $have_doxygen = yes], 104 [AX_COMPARE_VERSION([$doxygen_version], [eq], [1.5.8], 105 [AC_MSG_WARN([doxygen 1.5.8 detected - latex output turned off]) 106 dx_enable_latex=no])]) 107 fi 108 109 # we need latex output to generate dvi, ps, and pdf 110 AS_IF([test $dx_enable_latex = yes], 111 [dx_enable_pdf=yes 112 ACLTX_PROG_PDFLATEX([dx_enable_pdf=no]) 113 ACLTX_PROG_MAKEINDEX([dx_enable_pdf=no]) 114 dx_enable_dvi=yes 115 ACLTX_PROG_LATEX([dx_enable_dvi=no]) 116 # ps needs dvi 117 dx_enable_ps=$dx_enable_dvi 118 ACLTX_PROG_DVIPS([dx_enable_ps=no]) 119 AS_IF([test "x$dx_enable_ps" != xno], [ 120 YAT_PROG_DVIPS_PSPICTURE([], [dx_enable_ps=no 121 AC_MSG_NOTICE([ps generation turned off])]) 122 ]) 123 ] 124 ) 97 fi 125 98 126 99 AC_SUBST(have_doxygen) 127 100 AM_CONDITIONAL([DX_ENABLE_HTML], [test x$have_doxygen = xyes]) 128 AM_CONDITIONAL([DX_ENABLE_LATEX], [test x$dx_enable_latex = xyes])129 AM_CONDITIONAL([DX_ENABLE_DVI], [test x$dx_enable_dvi = xyes])130 AM_CONDITIONAL([DX_ENABLE_PS], [test x$dx_enable_ps = xyes])131 AM_CONDITIONAL([DX_ENABLE_PDF], [test x$dx_enable_pdf = xyes])132 101 AC_CONFIG_FILES([test/documentation_test.sh], 133 102 [chmod +x test/documentation_test.sh]) -
trunk/doc/Makefile.am
r2266 r2297 56 56 $(top_builddir)/yat/utility/doxygen.mk 57 57 58 doc: html dvi ps pdf58 doc: html 59 59 60 60 61 61 # these are supported by automake and *-local will add target to * 62 if DX_ENABLE_DVI63 dvi-local: $(PACKAGE).dvi64 endif65 if DX_ENABLE_PS66 ps-local: $(PACKAGE).ps67 endif68 if DX_ENABLE_PDF69 pdf-local: $(PACKAGE).pdf70 endif71 62 if DX_ENABLE_HTML 72 63 html-local: $(DX_HTML_OUTPUT)/index.html 73 endif74 75 # this is not supported by automake - there is no target latex76 if DX_ENABLE_LATEX77 latex-local: $(DX_LATEX_OUTPUT)/refman.tex78 64 endif 79 65 … … 82 68 echo GENERATE_HTML = YES) | $(DOXYGEN) -; 83 69 84 $(DX_LATEX_OUTPUT)/refman.tex: $(DOXYGEN_DEPS)85 @(cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \86 echo GENERATE_LATEX = YES) | $(DOXYGEN) -;87 88 $(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex89 cd $(DX_LATEX_OUTPUT) && $(latex) refman.tex && $(latex) refman.tex90 cp $(DX_LATEX_OUTPUT)/refman.dvi $(PACKAGE).dvi91 92 $(PACKAGE).ps: $(PACKAGE).dvi93 cd $(DX_LATEX_OUTPUT) && $(dvips) -q -o refman.ps refman.dvi;94 cp $(DX_LATEX_OUTPUT)/refman.ps $(PACKAGE).ps95 96 $(PACKAGE).pdf: $(DX_LATEX_OUTPUT)/refman.tex97 cd $(DX_LATEX_OUTPUT) && $(MAKE) pdf;98 cp $(DX_LATEX_OUTPUT)/refman.pdf $(PACKAGE).pdf99 100 70 101 71 install-data-hook: 102 72 @$(NORMAL_INSTALL) 103 @$(MAKE) $(AM_MAKEFLAGS) install- dvi install-ps install-pdf install-html73 @$(MAKE) $(AM_MAKEFLAGS) install-html 104 74 105 75 uninstall-hook: 106 76 @$(NORMAL_UNINSTALL) 107 rm -rf $(DESTDIR)$(htmldir)/html $(DESTDIR)$(dvidir)/$(PACKAGE).dvi \ 108 $(DESTDIR)$(psdir)/$(PACKAGE).ps $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf 77 rm -rf $(DESTDIR)$(htmldir)/html 109 78 110 79 installdirs-local: … … 128 97 fi 129 98 130 install-dvi-local:131 @if test -f "$(PACKAGE).dvi"; then \132 test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)";\133 $(INSTALL_DATA) $(PACKAGE).dvi "$(DESTDIR)$(dvidir)/$(PACKAGE).dvi"; \134 echo "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\135 fi136 137 install-ps-local:138 @if test -f "$(PACKAGE).ps"; then \139 test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)";\140 $(INSTALL_DATA) $(PACKAGE).ps "$(DESTDIR)$(psdir)/$(PACKAGE).ps"; \141 echo "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\142 fi143 144 install-pdf-local:145 @if test -f "$(PACKAGE).pdf"; then \146 test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)";\147 $(INSTALL_DATA) $(PACKAGE).pdf "$(DESTDIR)$(pdfdir)/$(PACKAGE).pdf"; \148 echo "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\149 fi150 151 152 99 mostlyclean-local: 153 100 rm -f doxygen.error *~ 154 101 155 102 clean-local: 156 rm -rf $(PACKAGE).dvi $(PACKAGE).ps $(PACKAGE).pdf $(DX_HTML_OUTPUT) \ 157 $(DX_LATEX_OUTPUT) stamp-doxygen 103 rm -rf $(DX_HTML_OUTPUT) 158 104 159 105 FORCE:
Note: See TracChangeset
for help on using the changeset viewer.