finish docs?

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 5636fa302e1525a8440d20574276badc786794ad..e80d5c5043c02459d9685d418953cfae8d06c009 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -117,6 +117,42 @@ FIGURE_SYNTAX = \
  doc/pspp-figures/chisquare.sps \
  doc/pspp-figures/compute.sps \
  doc/pspp-figures/count.sps \
+ doc/pspp-figures/ctables1.sps \
+ doc/pspp-figures/ctables2.sps \
+ doc/pspp-figures/ctables3.sps \
+ doc/pspp-figures/ctables4.sps \
+ doc/pspp-figures/ctables5.sps \
+ doc/pspp-figures/ctables6.sps \
+ doc/pspp-figures/ctables7.sps \
+ doc/pspp-figures/ctables8.sps \
+ doc/pspp-figures/ctables9.sps \
+ doc/pspp-figures/ctables10.sps \
+ doc/pspp-figures/ctables11.sps \
+ doc/pspp-figures/ctables12.sps \
+ doc/pspp-figures/ctables13.sps \
+ doc/pspp-figures/ctables14.sps \
+ doc/pspp-figures/ctables15.sps \
+ doc/pspp-figures/ctables16.sps \
+ doc/pspp-figures/ctables17.sps \
+ doc/pspp-figures/ctables18.sps \
+ doc/pspp-figures/ctables19.sps \
+ doc/pspp-figures/ctables20.sps \
+ doc/pspp-figures/ctables21.sps \
+ doc/pspp-figures/ctables22.sps \
+ doc/pspp-figures/ctables23.sps \
+ doc/pspp-figures/ctables24.sps \
+ doc/pspp-figures/ctables25.sps \
+ doc/pspp-figures/ctables26.sps \
+ doc/pspp-figures/ctables27.sps \
+ doc/pspp-figures/ctables28.sps \
+ doc/pspp-figures/ctables29.sps \
+ doc/pspp-figures/ctables30.sps \
+ doc/pspp-figures/ctables31.sps \
+ doc/pspp-figures/ctables32.sps \
+ doc/pspp-figures/ctables33.sps \
+ doc/pspp-figures/ctables34.sps \
+ doc/pspp-figures/ctables35.sps \
+ doc/pspp-figures/ctables36.sps \
  doc/pspp-figures/crosstabs.sps \
  doc/pspp-figures/descriptives.sps \
  doc/pspp-figures/flip.sps \
@@ -127,6 +163,7 @@ FIGURE_SYNTAX = \
  doc/pspp-figures/independent-samples-t.sps \
  doc/pspp-figures/reliability.sps \
  doc/pspp-figures/select-if.sps \
+ doc/pspp-figures/show-system.sps \
  doc/pspp-figures/sort-cases.sps \
  doc/pspp-figures/split.sps \
  doc/pspp-figures/temporary.sps \
@@ -245,6 +282,13 @@ EXTRA_DIST += doc/tutorial.stt
 .spv.html:
        $(convert) -O format=html -O bare=true
 
+# Make sure that tutorial.stt outputs all layers, because a few of the
+# examples in the manual rely on that and it would be easy to replace
+# it with a style that didn't.
+ALL_LOCAL += tutorial-stt-must-print-all-layers
+tutorial-stt-must-print-all-layers:
+       $(AM_V_GEN)grep 'printAllLayers="true"' $(srcdir)/doc/tutorial.stt >/dev/null 2>&1 && touch $@
+
 # Convert a text file into a Texinfo file.
 .txt.texi:
        $(AM_V_GEN)$(SED) -e 's/@/@@/g' $< > $@
@@ -271,23 +315,23 @@ install-html-local: html-local $(HTML_SCREENSHOTS)
 
 desktopdir = $(datadir)/applications
 
-doc/org.fsf.pspp.metainfo.xml: doc/org.fsf.pspp.metainfo.xml.in $(POFILES)
+doc/org.gnu.pspp.metainfo.xml: doc/org.gnu.pspp.metainfo.xml.in $(POFILES)
        $(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po || \
          $(MSGFMT) -L appdata --xml --template $< -o $@ -d $(top_srcdir)/po
 
-doc/org.fsf.pspp.desktop: doc/org.fsf.pspp.desktop.in $(POFILES)
+doc/org.gnu.pspp.desktop: doc/org.gnu.pspp.desktop.in $(POFILES)
        $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po
 
-CLEANFILES+=doc/org.fsf.pspp.desktop \
-            doc/org.fsf.pspp.metainfo.xml
+CLEANFILES+=doc/org.gnu.pspp.desktop \
+            doc/org.gnu.pspp.metainfo.xml
 
-desktop_DATA = doc/org.fsf.pspp.desktop
+desktop_DATA = doc/org.gnu.pspp.desktop
 
 appdatadir = $(datadir)/metainfo
-dist_appdata_DATA = doc/org.fsf.pspp.metainfo.xml
+dist_appdata_DATA = doc/org.gnu.pspp.metainfo.xml
 
-EXTRA_DIST += doc/org.fsf.pspp.metainfo.xml.in \
-       doc/org.fsf.pspp.desktop.in
+EXTRA_DIST += doc/org.gnu.pspp.metainfo.xml.in \
+       doc/org.gnu.pspp.desktop.in
 
 \f