Changeset 499

Timestamp:

11/28/2009 01:58:45 AM (2 years ago)

Author:

powell

Message:

Major update to documentation system so "make install" installs everything.

Files:

• trunk/matml/src/ternary/Makefile.am (modified) (6 diffs)

trunk/matml/src/ternary/Makefile.am

@@ -45 +45 @@
 EXTRA_DIST = autogen.sh macros/autogen.sh macros/cxref-latex.m4 \
              images/freenergy-0.1.0.png images/freenergy-0.2.0.png \
-             images/freenergy-0.3.0.png ternary.bib
+             images/freenergy-0.3.0.png images/freenergy-0.3.0.png ternary.bib
 
 # Everything from here down is documentation stuff.
@@ -79 +79 @@
 # This only works for srcdir=buildir, because cxref breaks with separate source
 cxref-html: @PACKAGE@.html $(BUILT_TEXFILES:.tex=)
-        rm -rf html
-        install -d html
+#       rm -rf html
+#       install -d html
         @CXREF@ -CPP 'gcc -E -C -dD -dI' -html-src -N@PACKAGE@ \
           $(PETSC_INCLUDE) $(ILLUMINATOR_CFLAGS) -I$(top_builddir) \
           $(BUILT_TEXFILES:.tex=)
-        mv $(CXREF_HTML_DOCS) html/
-        cp -p @PACKAGE@.html html/index.html
+#       mv $(CXREF_HTML_DOCS) html/
+#       cp -p @PACKAGE@.html html/index.html
         touch $@ # so @PACKAGE@.html isn't newer
 
@@ -123 +123 @@
 
 if HAVE_DVIPS
-PS_DOCS = @PACKAGE@.ps @PACKAGE@.ps.gz
+PS_DOCS = @PACKAGE@.ps
 @PACKAGE@.ps: @PACKAGE@.dvi @PACKAGE@.html
         @DVIPS@ $< -o $@
-        gzip -c --best @PACKAGE@.ps > @PACKAGE@.ps.gz
         grep -v HAVE_DVIPS @PACKAGE@.html > @PACKAGE@.html.new
         mv -f @PACKAGE@.html.new @PACKAGE@.html
@@ -139 +138 @@
 if HAVE_HEVEA
 HEVEA_DOCS = @PACKAGE@-tex.html
-@PACKAGE@-tex.html: @PACKAGE@.tex cxref-tex @PACKAGE@.html
+@PACKAGE@-tex.html: @PACKAGE@.tex cxref-tex @PACKAGE@.html cxref-html
         hevea -I . -exec xxdate.exe -o $@ $<
         grep -v HAVE_HEVEA @PACKAGE@.html > @PACKAGE@.html.new
@@ -171 +170 @@
 if HAVE_CXREF
         rm -f @PACKAGE@-doc-@VERSION@/index.html @PACKAGE@-doc-@VERSION@/cxref-html
-        cp -p html/*.html @PACKAGE@-doc-@VERSION@/
+        cp -p $(HEVEA_DOCS) $(LATEX2HTML_DOCS) $(CXREF_HTML_DOCS) @PACKAGE@-doc-@VERSION@/
         rm -f @PACKAGE@-doc-@VERSION@/index.html
 endif # HAVE_CXREF
@@ -177 +176 @@
         touch $@
 
+pdf_DATA = $(PDF_DOCS)
+dvi_DATA = $(DVI_DOCS)
+ps_DATA = $(PS_DOCS)
+html_DATA = $(HEVEA_DOCS) $(CXREF_HTML_DOCS) @PACKAGE@.html
+doc_DATA = $(LATEX2HTML_DOCS)
+
 CLEANFILES = *.aux *.log *.bbl *.blg *.toc *.sty *.dvi *.pdf *.ps *.ps.gz \
   *.tar.gz *.css $(BUILT_TEXFILES) $(CXREF_HTML_DOCS) cxref-tex cxref-html \
-  @PACKAGE@-tex.html stamp-doc
+  @PACKAGE@-tex.html html @PACKAGE@-doc-@VERSION@ stamp-doc
 
 clean-local: