Changeset 957

Timestamp:

Oct 9, 2007, 10:07:24 PM (16 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:

• configure.ac (modified) (4 diffs)
• doc/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -46 +46 @@
 AC_PROG_CXX
 AC_PROG_INSTALL
-AC_CHECK_PROG([DOXYGEN], [doxygen], [yes], [no])
-AC_CHECK_PROG([DVIPDFM], [dvipdfm], [yes], [no])
-AC_CHECK_PROG([LATEX], [latex], [yes], [no])
-AC_CHECK_PROG([LATEX2HTML], [latex2html], [yes], [no])
+AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [true], [false])
+AC_CHECK_PROG([HAVE_DVIPDFM], [dvipdfm], [true], [false])
+AC_CHECK_PROG([HAVE_LATEX], [latex], [true], [false])
+AC_CHECK_PROG([HAVE_LATEX2HTML], [latex2html], [true], [false])
 
 # Checks for libraries.
@@ -144 +144 @@
 # when in debug mode
 if (test "$enable_debug" == "yes"); then
-   if (test "$DOXYGEN" != "yes") ; then
+   if (test "$HAVE_DOXYGEN" != "true") ; then
       AC_MSG_WARN([Doxygen was not found. Yat will compile and work
   without doxygen.  However, in order to enable 
@@ -150 +150 @@
   available at http://www.doxygen.org/])
    fi        
-   if (test "$LATEX" != "yes") ; then
+   if (test "$HAVE_LATEX" != "true") ; then
       AC_MSG_WARN([latex was not found. Yat will compile and work
   without latex. However, supporting documentation on 
@@ -156 +156 @@
   latex.])
    fi        
-   if (test "$DVIPDFM" != "yes") ; then
+   if (test "$HAVE_DVIPDFM" != "true") ; then
       AC_MSG_WARN([dvipdfm was not found. Yat will compile and work
   without dvipdfm. However, pdf document on statistics 
   used in yat cannot be generated without dvipdfm.])
    fi        
-   if (test "$LATEX2HTML" != "yes") ; then
+   if (test "$HAVE_LATEX2HTML" != "true") ; then
       AC_MSG_WARN([latex2html was not found. Yat will compile and work
   without Latex. However, html document on statistics 

trunk/doc/Makefile.am

@@ -27 +27 @@
 doc: doxygen.config doxygen-local Statistics-local
 
+dvi-local: Statistics.dvi
+
+pdf-local: Statistics.pdf
+
+html-local: doxygen.config doxygen-local html/Statistics/Statistics.html
+
+mostlyclean-local:
+  rm -rf *.toc *.log *.dvi *.aux *~
+
 clean-local:
-  rm -rf doxygen.config html latex \
- *.toc *.log *.dvi *.aux *~
+  rm -rf doxygen.config html latex Statistics.pdf
 
 doxygen-local: 
-  doxygen doxygen.config
+  @if $(HAVE_DOXYGEN); then \
+  doxygen doxygen.config; \
+  fi
 
 doxygen.config: 
@@ -38 +48 @@
 
 
-html/Statistics: Statistics.tex
-  latex2html Statistics.tex
-  @mv Statistics html/. 
+html/Statistics/Statistics.html: Statistics.tex
+  @$(install_sh) -d html/Statistics
+  @if $(HAVE_LATEX2HTML); then \
+  latex2html -t "Weighted Statistics used in yat." \
+  --dir html/Statistics Statistics.tex;\
+  fi
 
-Statistics-local: html/Statistics \
+Statistics-local: html/Statistics/Statistics.html \
   html/Statistics/Statistics.pdf
 
 Statistics.dvi: Statistics.tex
-  @latex Statistics.tex
-  @latex Statistics.tex
+  @if $(HAVE_LATEX); then \
+  @latex Statistics.tex; \
+  @latex Statistics.tex; \
+  fi
 
 Statistics.pdf: Statistics.dvi
-  @dvipdfm Statistics.dvi
+  @if $(HAVE_DVIPDFM); then \
+  dvipdfm Statistics.dvi; \
+  fi
 
-html/Statistics/Statistics.pdf: Statistics.pdf
-  @cp Statistics.pdf html/Statistics/.
-
+html/Statistics/Statistics.pdf: $(pdf)
+  @if test -f Statistics.pdf; then \
+    $(install_sh) -d html/Statistics; \
+    cp Statistics.pdf html/Statistics/.; \
+  fi