Changeset 1265

Timestamp:

Apr 9, 2008, 2:04:37 PM (15 years ago)

Author:

Peter

Message:

Changing so generated docs are not distributed and consequently docs can be generated in builddir

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• doc/Makefile.am (modified) (7 diffs)
• doc/doxygen.config.in (modified) (2 diffs)

trunk/configure.ac

@@ -163 +163 @@
 AC_DEFINE([YAT_DEV_BUILD],[DEV_BUILD], [false if tagged release])
 
+#doxygen stuff
+DX_HTML_OUTPUT=html
+DX_LATEX_OUTPUT=latex
+AC_SUBST(DX_HTML_OUTPUT)
+AC_SUBST(DX_LATEX_OUTPUT)
 
 

trunk/doc/Makefile.am

@@ -25 +25 @@
 # 02111-1307, USA.
 
-DX_HTML_OUTPUT=$(srcdir)/html
-DX_LATEX_OUTPUT=$(srcdir)/latex
 
 stamp-doxygen: doxygen.config Makefile
@@ -57 +55 @@
 doc: html dvi ps pdf
 
-EXTRA_DIST = $(srcdir)/$(PACKAGE).dvi $(srcdir)/$(PACKAGE).ps \
-$(srcdir)/$(PACKAGE).pdf $(DX_LATEX_OUTPUT) $(DX_HTML_OUTPUT)
 
 # these are supported by automake and *-local will add target to *
-dvi-local: update-stamp-doxygen $(srcdir)/$(PACKAGE).dvi
-ps-local: update-stamp-doxygen $(srcdir)/$(PACKAGE).ps
-pdf-local: update-stamp-doxygen $(srcdir)/$(PACKAGE).pdf
+dvi-local: update-stamp-doxygen $(PACKAGE).dvi
+ps-local: update-stamp-doxygen $(PACKAGE).ps
+pdf-local: update-stamp-doxygen $(PACKAGE).pdf
 html-local: update-stamp-doxygen $(DX_HTML_OUTPUT)/index.html
 
@@ -75 +71 @@
   @(cat doxygen.config; $(ECHO) GENERATE_LATEX = YES) | doxygen -;
 
-$(srcdir)/$(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex
+$(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex
   cd $(DX_LATEX_OUTPUT) && latex refman.tex && latex refman.tex
-  cp $(DX_LATEX_OUTPUT)/refman.dvi $(srcdir)/$(PACKAGE).dvi
+  cp $(DX_LATEX_OUTPUT)/refman.dvi $(PACKAGE).dvi
 
-$(srcdir)/$(PACKAGE).ps: $(PACKAGE).dvi
+$(PACKAGE).ps: $(PACKAGE).dvi
   cd $(DX_LATEX_OUTPUT) && dvips -o refman.ps refman.dvi;
-  cp $(DX_LATEX_OUTPUT)/refman.ps $(srcdir)/$(PACKAGE).ps
+  cp $(DX_LATEX_OUTPUT)/refman.ps $(PACKAGE).ps
 
-
-$(srcdir)/$(PACKAGE).pdf: $(DX_LATEX_OUTPUT)/refman.tex
+$(PACKAGE).pdf: $(DX_LATEX_OUTPUT)/refman.tex
   cd $(DX_LATEX_OUTPUT) && $(MAKE) pdf;
-  cp $(DX_LATEX_OUTPUT)/refman.pdf $(srcdir)/$(PACKAGE).pdf
+  cp $(DX_LATEX_OUTPUT)/refman.pdf $(PACKAGE).pdf
 
 endif
@@ -107 +102 @@
   @if test -f "$(PACKAGE).dvi"; then \
   test -d $(DESTDIR)$(dvidir) || $(MKDIR_P) $(DESTDIR)$(dvidir);\
-  $(INSTALL_DATA) $(srcdir)$(PACKAGE).dvi \
+  $(INSTALL_DATA) $(PACKAGE).dvi \
    $(DESTDIR)$(dvidir)/$(PACKAGE).dvi; \
   $(ECHO) $(INSTALL_DATA) $(PACKAGE).dvi \
@@ -116 +111 @@
   @if test -f "$(PACKAGE).ps"; then \
   test -d $(DESTDIR)$(psdir) || $(MKDIR_P) $(DESTDIR)$(psdir);\
-  $(INSTALL_DATA) $(srcdir)$(PACKAGE).ps \
+  $(INSTALL_DATA) $(PACKAGE).ps \
    $(DESTDIR)$(psdir)/$(PACKAGE).ps; \
   $(ECHO) $(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps;\
@@ -124 +119 @@
   @if test -f "$(PACKAGE).pdf"; then \
   test -d $(DESTDIR)$(pdfdir) || $(MKDIR_P) $(DESTDIR)$(pdfdir);\
-  $(INSTALL_DATA) $(srcdir)$(PACKAGE).pdf \
+  $(INSTALL_DATA) $(PACKAGE).pdf \
    $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf; \
   $(ECHO) $(INSTALL_DATA) $(PACKAGE).pdf \
@@ -135 +130 @@
 
 clean-local:
-  rm -rf doxygen.config
+  rm -rf $(PACKAGE).dvi $(PACKAGE).ps $(PACKAGE).pdf $(DX_HTML_OUTPUT) \
+  $(DX_LATEX_OUTPUT)
 
 FORCE:

trunk/doc/doxygen.config.in

@@ -478 +478 @@
 # put in front of it. If left blank `html' will be used as the default path.
 
-HTML_OUTPUT            = @srcdir@/html
+HTML_OUTPUT            = @DX_HTML_OUTPUT@
 
 # The HTML_HEADER tag can be used to specify a personal HTML header for 
@@ -569 +569 @@
 # put in front of it. If left blank `latex' will be used as the default path.
 
-LATEX_OUTPUT           = @srcdir@/latex
+LATEX_OUTPUT           = @DX_LATEX_OUTPUT@
 
 # If the COMPACT_LATEX tag is set to YES Doxygen generates more compact