Changeset 2297


Ignore:
Timestamp:
Jul 12, 2010, 3:22:39 PM (11 years ago)
Author:
Peter
Message:

dvi, ps, and pdf docs are no longer supported

Location:
trunk
Files:
6 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r2257 r2297  
    44
    55version 0.7 (released DATE)
     6  - dvi, ps and pdf docs are no longer generated
    67  - utility::load functions now work with std::string as well.
    78
  • trunk/configure.ac

    r2266 r2297  
    8585
    8686have_doxygen=no
    87 dx_enable_latex=no
    88 dx_enable_dvi=no
    89 dx_enable_ps=no
    90 dx_enable_pdf=no
    9187AC_PATH_PROG([DOXYGEN], [doxygen], [no])
    9288if test "$DOXYGEN" = "no"; then
     
    9995                      [have_doxygen=yes])
    10096   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 )
     97fi
    12598
    12699AC_SUBST(have_doxygen)
    127100AM_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])
    132101AC_CONFIG_FILES([test/documentation_test.sh],
    133102                [chmod +x test/documentation_test.sh])
  • trunk/doc/Makefile.am

    r2266 r2297  
    5656$(top_builddir)/yat/utility/doxygen.mk
    5757
    58 doc: html dvi ps pdf
     58doc: html
    5959
    6060
    6161# these are supported by automake and *-local will add target to *
    62 if DX_ENABLE_DVI
    63 dvi-local: $(PACKAGE).dvi
    64 endif
    65 if DX_ENABLE_PS
    66 ps-local: $(PACKAGE).ps
    67 endif
    68 if DX_ENABLE_PDF
    69 pdf-local: $(PACKAGE).pdf
    70 endif
    7162if DX_ENABLE_HTML
    7263html-local: $(DX_HTML_OUTPUT)/index.html
    73 endif
    74 
    75 # this is not supported by automake - there is no target latex
    76 if DX_ENABLE_LATEX
    77 latex-local: $(DX_LATEX_OUTPUT)/refman.tex
    7864endif
    7965
     
    8268  echo GENERATE_HTML = YES) | $(DOXYGEN) -;
    8369
    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.tex
    89   cd $(DX_LATEX_OUTPUT) && $(latex) refman.tex && $(latex) refman.tex
    90   cp $(DX_LATEX_OUTPUT)/refman.dvi $(PACKAGE).dvi
    91 
    92 $(PACKAGE).ps: $(PACKAGE).dvi
    93   cd $(DX_LATEX_OUTPUT) && $(dvips) -q -o refman.ps refman.dvi;
    94   cp $(DX_LATEX_OUTPUT)/refman.ps $(PACKAGE).ps
    95 
    96 $(PACKAGE).pdf: $(DX_LATEX_OUTPUT)/refman.tex
    97   cd $(DX_LATEX_OUTPUT) && $(MAKE) pdf;
    98   cp $(DX_LATEX_OUTPUT)/refman.pdf $(PACKAGE).pdf
    99 
    10070
    10171install-data-hook:
    10272  @$(NORMAL_INSTALL)
    103   @$(MAKE) $(AM_MAKEFLAGS) install-dvi install-ps install-pdf install-html
     73  @$(MAKE) $(AM_MAKEFLAGS) install-html
    10474
    10575uninstall-hook:
    10676  @$(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
    10978
    11079installdirs-local:
     
    12897  fi
    12998
    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   fi
    136 
    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   fi
    143 
    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   fi
    150 
    151 
    15299mostlyclean-local:
    153100  rm -f doxygen.error *~
    154101
    155102clean-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)
    158104
    159105FORCE:
Note: See TracChangeset for help on using the changeset viewer.