docs

[pspp] / doc / automake.mk

diff --git a/doc/automake.mk b/doc/automake.mk
index 4cc2b230ede16a93e1fcee62d407580ddf79ba76..7cc5595d2cb015cacb634c6a6c8f272a005ee9d5 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -46,6 +46,7 @@ doc_pspp_TEXINFOS = doc/version.texi \
        doc/regression.texi \
        doc/utilities.texi \
        doc/variables.texi \
+       doc/matrices.texi \
        doc/fdl.texi
 
 doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
@@ -61,18 +62,17 @@ doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
        doc/dev/portable-file-format.texi \
        doc/dev/spv-file-format.texi \
        doc/dev/tlo-file-format.texi \
-       doc/dev/encrypted-file-wrappers.texi \
-       doc/dev/q2c.texi
+       doc/dev/encrypted-file-wrappers.texi
 
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
 
-EXTRA_DIST += doc/get-commands.pl \
+EXTRA_DIST += doc/get-commands.py \
               doc/help-pages-list \
               doc/prepdoc.sh
 
-$(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
-       $(AM_V_GEN)$(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
+$(srcdir)/doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.py
+       $(AM_V_GEN)$(PYTHON3) $(top_srcdir)/doc/get-commands.py $(top_srcdir)/src/language/command.def > $@
 
 $(srcdir)/doc/tut.texi:
        $(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
@@ -117,14 +117,34 @@ 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/crosstabs.sps \
  doc/pspp-figures/descriptives.sps \
  doc/pspp-figures/flip.sps \
  doc/pspp-figures/frequencies.sps \
+ doc/pspp-figures/matrix-print.sps \
  doc/pspp-figures/means.sps \
  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/show-system.sps \
  doc/pspp-figures/sort-cases.sps \
  doc/pspp-figures/split.sps \
  doc/pspp-figures/temporary.sps \
@@ -189,16 +209,16 @@ pspp_output = native/utilities/pspp-output
 
 native/Makefile:
        $(MKDIR_P) native
-       (cd native && $(top_srcdir)/configure --without-gui)
+       (cd native && $(abs_top_srcdir)/configure --host=$(build) --without-gui)
 
-native/gl/libgl.la: native/Makefile
-       (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) gl/libgl.la)
+# The gnulib header files are required for the object files of the native pspp
+# They are defined in BUILT_SOURCES but that is only defined as a first dependency
+# for the make all target. src/ui/terminal/pspp as a target will try to compile the
+# objects first but that fails without the header files. Therefore I build the native
+# executables via the default make target
+$(pspp) $(pspp_output) &: native/Makefile
+       (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) )
 
-$(pspp): native/gl/libgl.la
-       (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) src/ui/terminal/pspp)
-
-$(pspp_output): native/gl/libgl.la
-       (cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) utilities/pspp-output)
 else
 pspp = src/ui/terminal/pspp$(EXEEXT)
 pspp_output = utilities/pspp-output$(EXEEXT)
@@ -206,8 +226,8 @@ endif
 
 $(FIGURE_SPVS): $(pspp)
 .sps.spv:
-       $(AM_V_GEN)(cd $(top_srcdir)/examples \
-         && $(abs_top_builddir)/$(pspp) ../doc/pspp-figures/$(<F) -o - -O format=spv) > $@.tmp
+       $(AM_V_GEN)(cd "$(top_srcdir)/examples" \
+         && "$(abs_top_builddir)/$(pspp)" ../doc/pspp-figures/$(<F) -o - -O format=spv) > $@.tmp
        $(AM_V_at)mv $@.tmp $@
 
 # In some cases, the tutorial only wants some parts of the output.
@@ -295,6 +315,7 @@ $(top_srcdir)/doc/screenshots/chisquare.grab \
 $(top_srcdir)/doc/screenshots/count.grab \
 $(top_srcdir)/doc/screenshots/count-define.grab \
 $(top_srcdir)/doc/screenshots/compute.grab \
+$(top_srcdir)/doc/screenshots/crosstabs.grab \
 $(top_srcdir)/doc/screenshots/descriptives.grab \
 $(top_srcdir)/doc/screenshots/one-sample-t.grab \
 $(top_srcdir)/doc/screenshots/independent-samples-t.grab \