Documentation: Add an example showing how AGGREGATE works

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index a44ab26587eee204b748d79d8c1ad23144d37433..7cbb819db364361a9bd5fa954093760e706deeed 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -81,8 +81,8 @@ doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
 if BROKEN_DOCBOOK_XML
        touch $@
 else
-       $(AM_V_GEN)$(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \
-               $< -o $@
+       $(AM_V_GEN)$(MAKEINFO) --docbook $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+               -I doc -I $(srcdir)/doc $< -o $@
 endif
 
 docbookdir = $(docdir)
@@ -106,14 +106,13 @@ EXTRA_DIST += \
        doc/help-pages-list \
        doc/pspp-manual.css
 
-
-AM_MAKEINFOFLAGS=-I $(top_srcdir)/doc/pspp-figures -I $(top_builddir)/doc/pspp-figures
-am__TEXINFO_TEX_DIR=:$(top_srcdir)/doc/pspp-figures:$(top_builddir)/doc/pspp-figures
+am__TEXINFO_TEX_DIR=:$(top_srcdir)/doc:$(top_builddir)/doc
 
 ################# Example programs ##############################
 
 FIGURE_SYNTAX = \
- doc/pspp-figures/autorecode.sps \
+ doc/pspp-figures/aggregate.sps \
+doc/pspp-figures/autorecode.sps \
  doc/pspp-figures/chisquare.sps \
  doc/pspp-figures/compute.sps \
  doc/pspp-figures/count.sps \
@@ -124,7 +123,9 @@ FIGURE_SYNTAX = \
  doc/pspp-figures/one-sample-t.sps \
  doc/pspp-figures/independent-samples-t.sps \
  doc/pspp-figures/reliability.sps \
+ doc/pspp-figures/select-if.sps \
  doc/pspp-figures/split.sps \
+ doc/pspp-figures/temporary.sps \
  doc/pspp-figures/tutorial1.sps \
  doc/pspp-figures/tutorial2.sps \
  doc/pspp-figures/tutorial3.sps \
@@ -193,11 +194,11 @@ doc/pspp-figures/tutorial7b.spv: doc/pspp-figures/tutorial7.spv $(pspp_output)
 # Convert an output file into a text file or HTML file.
 $(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output)
 .spv.txt:
-       $(AM_V_GEN)utilities/pspp-output convert $< $@
+       $(convert)
 .spv.pdf:
-       $(AM_V_GEN)utilities/pspp-output convert $< $@ -O left-margin=0pt -O right-margin=0pt -O top-margin=0pt -O bottom-margin=0pt -O paper-size=6x20in -O font-size=12000 --table-look=$(HOME)/pspp/spss15/Looks/report.tlo
+       $(convert) -O left-margin=0pt -O right-margin=0pt -O top-margin=0pt -O bottom-margin=0pt -O paper-size=6x20in -O font-size=12000 --table-look=$(HOME)/pspp/spss15/Looks/report.tlo
 .spv.html:
-       $(AM_V_GEN)utilities/pspp-output convert $< $@ -O format=html -O bare=true
+       $(convert) -O format=html -O bare=true
 
 # Convert a text file into a Texinfo file.
 .txt.texi: