Changeset 957


Ignore:
Timestamp:
Oct 9, 2007, 10:07:24 PM (14 years ago)
Author:
Peter
Message:

Generation of documentation is disabled if software is missing. For
example if doxygen is missing doxygen is not issued, but for example
Statistics.pdf is generated and so on and so forth.

Also, I added variables dvi-local, pdf-local, and html-local. This
means that one now can issue ,e.g., 'make pdf' and hopefully get what one was
hoping for.

I divided clean-local into clean-local and mostlyclean-local. The
latter is included in a 'make mostlyclean' call and both are included
in a 'make clean' call.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r955 r957  
    4646AC_PROG_CXX
    4747AC_PROG_INSTALL
    48 AC_CHECK_PROG([DOXYGEN], [doxygen], [yes], [no])
    49 AC_CHECK_PROG([DVIPDFM], [dvipdfm], [yes], [no])
    50 AC_CHECK_PROG([LATEX], [latex], [yes], [no])
    51 AC_CHECK_PROG([LATEX2HTML], [latex2html], [yes], [no])
     48AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [true], [false])
     49AC_CHECK_PROG([HAVE_DVIPDFM], [dvipdfm], [true], [false])
     50AC_CHECK_PROG([HAVE_LATEX], [latex], [true], [false])
     51AC_CHECK_PROG([HAVE_LATEX2HTML], [latex2html], [true], [false])
    5252
    5353# Checks for libraries.
     
    144144# when in debug mode
    145145if (test "$enable_debug" == "yes"); then
    146    if (test "$DOXYGEN" != "yes") ; then
     146   if (test "$HAVE_DOXYGEN" != "true") ; then
    147147      AC_MSG_WARN([Doxygen was not found. Yat will compile and work
    148148  without doxygen.  However, in order to enable
     
    150150  available at http://www.doxygen.org/])
    151151   fi       
    152    if (test "$LATEX" != "yes") ; then
     152   if (test "$HAVE_LATEX" != "true") ; then
    153153      AC_MSG_WARN([latex was not found. Yat will compile and work
    154154  without latex. However, supporting documentation on
     
    156156  latex.])
    157157   fi       
    158    if (test "$DVIPDFM" != "yes") ; then
     158   if (test "$HAVE_DVIPDFM" != "true") ; then
    159159      AC_MSG_WARN([dvipdfm was not found. Yat will compile and work
    160160  without dvipdfm. However, pdf document on statistics
    161161  used in yat cannot be generated without dvipdfm.])
    162162   fi       
    163    if (test "$LATEX2HTML" != "yes") ; then
     163   if (test "$HAVE_LATEX2HTML" != "true") ; then
    164164      AC_MSG_WARN([latex2html was not found. Yat will compile and work
    165165  without Latex. However, html document on statistics
  • trunk/doc/Makefile.am

    r865 r957  
    2727doc: doxygen.config doxygen-local Statistics-local
    2828
     29dvi-local: Statistics.dvi
     30
     31pdf-local: Statistics.pdf
     32
     33html-local: doxygen.config doxygen-local html/Statistics/Statistics.html
     34
     35mostlyclean-local:
     36  rm -rf *.toc *.log *.dvi *.aux *~
     37
    2938clean-local:
    30   rm -rf doxygen.config html latex \
    31  *.toc *.log *.dvi *.aux *~
     39  rm -rf doxygen.config html latex Statistics.pdf
    3240
    3341doxygen-local:
    34   doxygen doxygen.config
     42  @if $(HAVE_DOXYGEN); then \
     43  doxygen doxygen.config; \
     44  fi
    3545
    3646doxygen.config:
     
    3848
    3949
    40 html/Statistics: Statistics.tex
    41   latex2html Statistics.tex
    42   @mv Statistics html/.
     50html/Statistics/Statistics.html: Statistics.tex
     51  @$(install_sh) -d html/Statistics
     52  @if $(HAVE_LATEX2HTML); then \
     53  latex2html -t "Weighted Statistics used in yat." \
     54  --dir html/Statistics Statistics.tex;\
     55  fi
    4356
    44 Statistics-local: html/Statistics \
     57Statistics-local: html/Statistics/Statistics.html \
    4558  html/Statistics/Statistics.pdf
    4659
    4760Statistics.dvi: Statistics.tex
    48   @latex Statistics.tex
    49   @latex Statistics.tex
     61  @if $(HAVE_LATEX); then \
     62  @latex Statistics.tex; \
     63  @latex Statistics.tex; \
     64  fi
    5065
    5166Statistics.pdf: Statistics.dvi
    52   @dvipdfm Statistics.dvi
     67  @if $(HAVE_DVIPDFM); then \
     68  dvipdfm Statistics.dvi; \
     69  fi
    5370
    54 html/Statistics/Statistics.pdf: Statistics.pdf
    55   @cp Statistics.pdf html/Statistics/.
    56 
     71html/Statistics/Statistics.pdf: $(pdf)
     72  @if test -f Statistics.pdf; then \
     73    $(install_sh) -d html/Statistics; \
     74    cp Statistics.pdf html/Statistics/.; \
     75  fi
Note: See TracChangeset for help on using the changeset viewer.