projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
member variable
[pspp]
/
doc
/
automake.mk
diff --git
a/doc/automake.mk
b/doc/automake.mk
index 75e2e7ff025145d09fb944423a4f2c7606b077cd..6d2e6ebcc68bac6a69977b372749abcefa79f60b 100644
(file)
--- a/
doc/automake.mk
+++ b/
doc/automake.mk
@@
-46,11
+46,13
@@
doc_pspp_TEXINFOS = doc/version.texi \
doc/regression.texi \
doc/utilities.texi \
doc/variables.texi \
doc/regression.texi \
doc/utilities.texi \
doc/variables.texi \
+ doc/matrices.texi \
doc/fdl.texi
doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
doc/dev/intro.texi \
doc/dev/concepts.texi \
doc/fdl.texi
doc_pspp_dev_TEXINFOS = doc/version-dev.texi \
doc/dev/intro.texi \
doc/dev/concepts.texi \
+ doc/dev/gui.texi \
doc/dev/syntax.texi \
doc/dev/data.texi \
doc/dev/i18n.texi \
doc/dev/syntax.texi \
doc/dev/data.texi \
doc/dev/i18n.texi \
@@
-60,8
+62,7
@@
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/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
dist_man_MANS += doc/pspp.1 \
doc/psppire.1
@@
-116,9
+117,11
@@
FIGURE_SYNTAX = \
doc/pspp-figures/chisquare.sps \
doc/pspp-figures/compute.sps \
doc/pspp-figures/count.sps \
doc/pspp-figures/chisquare.sps \
doc/pspp-figures/compute.sps \
doc/pspp-figures/count.sps \
+ doc/pspp-figures/crosstabs.sps \
doc/pspp-figures/descriptives.sps \
doc/pspp-figures/flip.sps \
doc/pspp-figures/frequencies.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/means.sps \
doc/pspp-figures/one-sample-t.sps \
doc/pspp-figures/independent-samples-t.sps \
@@
-188,7
+191,7
@@
pspp_output = native/utilities/pspp-output
native/Makefile:
$(MKDIR_P) native
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)
native/gl/libgl.la: native/Makefile
(cd native && flock --verbose $(top_builddir)/native-lock $(MAKE) gl/libgl.la)
@@
-205,12
+208,12
@@
endif
$(FIGURE_SPVS): $(pspp)
.sps.spv:
$(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.
$(AM_V_at)mv $@.tmp $@
# In some cases, the tutorial only wants some parts of the output.
-convert = $(AM_V_GEN)$(pspp_output) convert $< $@
+convert = $(AM_V_GEN)
LSAN_OPTIONS="suppressions=$(abs_top_srcdir)/tests/lsan.supp:print_suppressions=0:$$LSAN_OPTIONS"
$(pspp_output) convert $< $@
doc/pspp-figures/tutorial2a.spv: doc/pspp-figures/tutorial2.spv $(pspp_output)
$(convert) --command='Descriptives'
doc/pspp-figures/tutorial2b.spv: doc/pspp-figures/tutorial2.spv $(pspp_output)
doc/pspp-figures/tutorial2a.spv: doc/pspp-figures/tutorial2.spv $(pspp_output)
$(convert) --command='Descriptives'
doc/pspp-figures/tutorial2b.spv: doc/pspp-figures/tutorial2.spv $(pspp_output)
@@
-224,6
+227,12
@@
doc/pspp-figures/tutorial7a.spv: doc/pspp-figures/tutorial7.spv $(pspp_output)
doc/pspp-figures/tutorial7b.spv: doc/pspp-figures/tutorial7.spv $(pspp_output)
$(convert) --commands=regression --nth-command=2 --subtypes=coefficients
doc/pspp-figures/tutorial7b.spv: doc/pspp-figures/tutorial7.spv $(pspp_output)
$(convert) --commands=regression --nth-command=2 --subtypes=coefficients
+
+$(FIGURE_PNGS): $(pspp_output)
+$(FIGURE_TXTS): $(pspp_output)
+$(FIGURE_HTMLS): $(pspp_output)
+$(FIGURE_PDFS): $(pspp_output)
+
# Convert an output file into a text file or HTML file.
$(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output)
.spv.txt:
# Convert an output file into a text file or HTML file.
$(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output)
.spv.txt:
@@
-288,6
+297,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/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 \
$(top_srcdir)/doc/screenshots/descriptives.grab \
$(top_srcdir)/doc/screenshots/one-sample-t.grab \
$(top_srcdir)/doc/screenshots/independent-samples-t.grab \