X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=daf47cf975d5e3f55cd5ce545d2b26989ea1fc61;hb=c1b1583b96cc05a2bf9f3f6d01bbfa063fafb253;hp=def0dbf395218a9aa634c7af75b648b39d130f8f;hpb=ca5f3ef6d3fc1293c2be6b531e3ab782b8c7af6e;p=pspp diff --git a/doc/automake.mk b/doc/automake.mk index def0dbf395..daf47cf975 100644 --- 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,15 +117,41 @@ 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/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 \ @@ -190,16 +216,16 @@ pspp_output = native/utilities/pspp-output native/Makefile: $(MKDIR_P) native - (cd native && $(abs_top_srcdir)/configure --host=$$build --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) @@ -207,8 +233,8 @@ endif $(FIGURE_SPVS): $(pspp) .sps.spv: - $(AM_V_GEN)(cd $(top_srcdir)/examples \ - && $(abs_top_builddir)/$(pspp) ../doc/pspp-figures/$( $@.tmp + $(AM_V_GEN)(cd "$(top_srcdir)/examples" \ + && "$(abs_top_builddir)/$(pspp)" ../doc/pspp-figures/$( $@.tmp $(AM_V_at)mv $@.tmp $@ # In some cases, the tutorial only wants some parts of the output. @@ -244,6 +270,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' $< > $@ @@ -270,23 +303,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