Changeset 2297

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:

• NEWS (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• doc/Makefile.am (modified) (3 diffs)
• m4/_acltx_test.m4 (deleted)
• m4/acltx_prog_dvips.m4 (deleted)
• m4/acltx_prog_latex.m4 (deleted)
• m4/acltx_prog_makeindex.m4 (deleted)
• m4/acltx_prog_pdflatex.m4 (deleted)
• m4/yat_prog_dvips_pspicture.m4 (deleted)

trunk/NEWS

@@ -4 +4 @@
 
 version 0.7 (released DATE)
+  - dvi, ps and pdf docs are no longer generated
   - utility::load functions now work with std::string as well.
 

trunk/configure.ac

@@ -85 +85 @@
 
 have_doxygen=no
-dx_enable_latex=no
-dx_enable_dvi=no
-dx_enable_ps=no
-dx_enable_pdf=no
 AC_PATH_PROG([DOXYGEN], [doxygen], [no])
 if test "$DOXYGEN" = "no"; then
@@ -99 +95 @@
                       [have_doxygen=yes])
    AC_MSG_RESULT([$doxygen_version])
-   dx_enable_latex=yes
-   # doxygen 1.5.8 has a bug for latex output and enums
-   AS_IF([test $have_doxygen = yes],
-         [AX_COMPARE_VERSION([$doxygen_version], [eq], [1.5.8],
-                 [AC_MSG_WARN([doxygen 1.5.8 detected - latex output turned off])
-                  dx_enable_latex=no])])
-fi
-
-# we need latex output to generate dvi, ps, and pdf
-AS_IF([test $dx_enable_latex = yes],
-  [dx_enable_pdf=yes
-   ACLTX_PROG_PDFLATEX([dx_enable_pdf=no])
-   ACLTX_PROG_MAKEINDEX([dx_enable_pdf=no])
-   dx_enable_dvi=yes
-   ACLTX_PROG_LATEX([dx_enable_dvi=no])
-   # ps needs dvi
-   dx_enable_ps=$dx_enable_dvi
-   ACLTX_PROG_DVIPS([dx_enable_ps=no])
-   AS_IF([test "x$dx_enable_ps" != xno], [
-     YAT_PROG_DVIPS_PSPICTURE([], [dx_enable_ps=no
-                                   AC_MSG_NOTICE([ps generation turned off])])
-   ])
-  ]
-)
+fi
 
 AC_SUBST(have_doxygen)
 AM_CONDITIONAL([DX_ENABLE_HTML], [test x$have_doxygen = xyes])
-AM_CONDITIONAL([DX_ENABLE_LATEX], [test x$dx_enable_latex = xyes])
-AM_CONDITIONAL([DX_ENABLE_DVI], [test x$dx_enable_dvi = xyes])
-AM_CONDITIONAL([DX_ENABLE_PS], [test x$dx_enable_ps = xyes])
-AM_CONDITIONAL([DX_ENABLE_PDF], [test x$dx_enable_pdf = xyes])
 AC_CONFIG_FILES([test/documentation_test.sh], 
                 [chmod +x test/documentation_test.sh])

trunk/doc/Makefile.am

@@ -56 +56 @@
 $(top_builddir)/yat/utility/doxygen.mk 
 
-doc: html dvi ps pdf
+doc: html
 
 
 # these are supported by automake and *-local will add target to *
-if DX_ENABLE_DVI
-dvi-local: $(PACKAGE).dvi
-endif
-if DX_ENABLE_PS
-ps-local: $(PACKAGE).ps
-endif
-if DX_ENABLE_PDF
-pdf-local: $(PACKAGE).pdf
-endif
 if DX_ENABLE_HTML
 html-local: $(DX_HTML_OUTPUT)/index.html
-endif
-
-# this is not supported by automake - there is no target latex
-if DX_ENABLE_LATEX
-latex-local: $(DX_LATEX_OUTPUT)/refman.tex
 endif
 
@@ -82 +68 @@
   echo GENERATE_HTML = YES) | $(DOXYGEN) -;
 
-$(DX_LATEX_OUTPUT)/refman.tex: $(DOXYGEN_DEPS)
-  @(cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \
-  echo GENERATE_LATEX = YES) | $(DOXYGEN) -;
-
-$(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex
-  cd $(DX_LATEX_OUTPUT) && $(latex) refman.tex && $(latex) refman.tex
-  cp $(DX_LATEX_OUTPUT)/refman.dvi $(PACKAGE).dvi
-
-$(PACKAGE).ps: $(PACKAGE).dvi
-  cd $(DX_LATEX_OUTPUT) && $(dvips) -q -o refman.ps refman.dvi;
-  cp $(DX_LATEX_OUTPUT)/refman.ps $(PACKAGE).ps
-
-$(PACKAGE).pdf: $(DX_LATEX_OUTPUT)/refman.tex
-  cd $(DX_LATEX_OUTPUT) && $(MAKE) pdf;
-  cp $(DX_LATEX_OUTPUT)/refman.pdf $(PACKAGE).pdf
-
 
 install-data-hook:
   @$(NORMAL_INSTALL)
-  @$(MAKE) $(AM_MAKEFLAGS) install-dvi install-ps install-pdf install-html
+  @$(MAKE) $(AM_MAKEFLAGS) install-html
 
 uninstall-hook:
   @$(NORMAL_UNINSTALL)
-  rm -rf $(DESTDIR)$(htmldir)/html $(DESTDIR)$(dvidir)/$(PACKAGE).dvi \
-  $(DESTDIR)$(psdir)/$(PACKAGE).ps $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf
+  rm -rf $(DESTDIR)$(htmldir)/html
 
 installdirs-local:
@@ -128 +97 @@
   fi
 
-install-dvi-local:
-  @if test -f "$(PACKAGE).dvi"; then \
-    test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)";\
-    $(INSTALL_DATA) $(PACKAGE).dvi "$(DESTDIR)$(dvidir)/$(PACKAGE).dvi"; \
-    echo "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\
-  fi
-
-install-ps-local:
-  @if test -f "$(PACKAGE).ps"; then \
-    test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)";\
-    $(INSTALL_DATA) $(PACKAGE).ps "$(DESTDIR)$(psdir)/$(PACKAGE).ps"; \
-    echo "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\
-  fi
-
-install-pdf-local:
-  @if test -f "$(PACKAGE).pdf"; then \
-    test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)";\
-    $(INSTALL_DATA) $(PACKAGE).pdf "$(DESTDIR)$(pdfdir)/$(PACKAGE).pdf"; \
-    echo "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\
-  fi
-
-
 mostlyclean-local:
   rm -f doxygen.error *~ 
 
 clean-local:
-  rm -rf $(PACKAGE).dvi $(PACKAGE).ps $(PACKAGE).pdf $(DX_HTML_OUTPUT) \
-  $(DX_LATEX_OUTPUT) stamp-doxygen
+  rm -rf $(DX_HTML_OUTPUT)
 
 FORCE: