X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fautomake.mk;h=b928691085d4ecefd4d0556dfbba6b13ede7ced6;hb=e498eeae4ff48d80085ea4d5c340bcfd13151083;hp=3d2377c258fcdb4e96a42ff82c488dcdcb71ea5a;hpb=0e958ac80f5add8d0581c218badbdf9bddcde9bc;p=pspp

diff --git a/doc/automake.mk b/doc/automake.mk
index 3d2377c258..b928691085 100644
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -51,6 +51,7 @@ doc_pspp_TEXINFOS = doc/version.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 \
@@ -60,8 +61,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/encrypted-file-wrappers.texi \
-	doc/dev/q2c.texi
+	doc/dev/encrypted-file-wrappers.texi
 
 dist_man_MANS += doc/pspp.1 \
                  doc/psppire.1
@@ -92,7 +92,7 @@ dist_docbook_DATA = doc/pspp.xml
 CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc/pspp.info* doc/pspp.xml
 
 
-doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
+doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PNGS) $(HTMLS) $(dist_docbook_DATA)
 PHONY += doc
 
 doc/help-pages-list: $(UI_FILES)
@@ -116,6 +116,7 @@ FIGURE_SYNTAX = \
  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 \
@@ -150,35 +151,67 @@ FIGURE_TXTS = $(FIGURE_SPVS:.spv=.txt)
 FIGURE_TEXIS = $(FIGURE_TXTS:.txt=.texi)
 FIGURE_HTMLS = $(FIGURE_SPVS:.spv=.html)
 FIGURE_PDFS = $(FIGURE_SPVS:.spv=.pdf)
+FIGURE_PNGS = $(FIGURE_SPVS:.spv=.png)
 
 figure-spvs: $(FIGURE_SPVS)
 figure-txts: $(FIGURE_TXTS)
 figure-texis: $(FIGURE_TEXIS)
 figure-htmls: $(FIGURE_HTMLS)
 figure-pdfs: $(FIGURE_PDFS)
-PHONY += figure-spv figure-txts figure-texis figure-htmls figure-pdfs
-
-$(top_builddir)/doc/pspp.info:  $(FIGURE_TEXIS)
+figure-pngs: $(FIGURE_PNGS)
+PHONY += \
+	figure-spv \
+	figure-txts \
+	figure-texis \
+	figure-htmls \
+	figure-pdfs \
+	figure-pngs
+
+$(top_builddir)/doc/pspp.info:  $(FIGURE_PNGS)
 $(top_builddir)/doc/pspp.ps:    $(FIGURE_TEXIS)
 $(top_builddir)/doc/pspp.dvi:   $(FIGURE_TEXIS)
 $(top_builddir)/doc/pspp.html:  $(FIGURE_HTMLS)
 $(top_builddir)/doc/pspp.pdf:   $(FIGURE_TEXIS)
 $(top_builddir)/doc/pspp.xml:   $(FIGURE_TEXIS)
 
-CLEANFILES += $(FIGURE_TXTS) $(FIGURE_SPVS) $(FIGURE_TEXIS) $(FIGURE_HTMLS)
-SUFFIXES += .sps .spv .txt .html .texi .pdf
+CLEANFILES += \
+	$(FIGURE_TXTS) \
+	$(FIGURE_SPVS) \
+	$(FIGURE_TEXIS) \
+	$(FIGURE_HTMLS) \
+	$(FIGURE_PNGS)
+SUFFIXES += .sps .spv .txt .html .texi .pdf .png
 
 # Use pspp to process a syntax file into an output file.
-pspp = src/ui/terminal/pspp
-$(FIGURE_SPVS): $(pspp)$(EXEEXT)
+if cross_compiling
+pspp = native/src/ui/terminal/pspp
+pspp_output = native/utilities/pspp-output
+
+native/Makefile:
+	$(MKDIR_P) native
+	(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)
+
+$(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)
+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_at)mv $@.tmp $@
 
 # In some cases, the tutorial only wants some parts of the output.
-pspp_output = utilities/pspp-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)
@@ -192,12 +225,21 @@ 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
 
+
+$(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)
 .spv.pdf:
-	$(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 trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt
+.spv.png:
+	$(convert) -O trim=true -O left-margin=0in -O right-margin=0in -O top-margin=0in -O bottom-margin=0in -O paper-size=7.5x99in --table-look=$(srcdir)/doc/tutorial.stt
+EXTRA_DIST += doc/tutorial.stt
 .spv.html:
 	$(convert) -O format=html -O bare=true
 
@@ -208,7 +250,8 @@ $(FIGURE_TXTS) $(FIGURE_HTMLS): $(pspp_output)
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS) --css-ref=pspp-manual.css
 # Adjust the path for screenshot images.
 # But make sure these operations are idempotent.
-html-local:
+html-local: doc/pspp.html
+	test -d doc/pspp.html
 	for h in doc/pspp.html/*.html; do \
 		if grep -Fq '<img src="screenshots/' $$h; then continue; fi ; \
 		$(SED) -i -e 's|<img src="\([^"]*\)"|<img src="screenshots/\1"|' $$h; \
@@ -252,6 +295,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 \
@@ -279,16 +323,24 @@ doc-make: doc/doc-make.in Makefile
 
 
 # Install all the PNG files so that info readers can recognise them
-install-info-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/info/
+install-info-local: $(FIGURE_PNGS)
+	$(MKDIR_P) $(DESTDIR)$(infodir)/screenshots
 	for p in $(INFO_SCREENSHOTS); do \
-		$(INSTALL_DATA) $$p $(DESTDIR)$(prefix)/share/info/ ;\
+		$(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/screenshots ;\
+	done
+	$(INSTALL) -d $(DESTDIR)$(infodir)/pspp-figures
+	for p in $(FIGURE_PNGS); do \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/pspp-figures ;\
 	done
 
 uninstall-local:
 	for p in $(INFO_SCREENSHOTS); do \
 		f=`basename $$p ` ; \
-		$(RM) $(DESTDIR)$(prefix)/share/info/$$f ; \
+		rm -f $(DESTDIR)$(infodir)/screenshots/$$f ; \
+	done
+	for p in $(FIGURE_PNGS); do \
+		f=`basename $$p ` ; \
+		rm -f $(DESTDIR)$(infodir)/pspp-figures/$$f ; \
 	done
 
 EXTRA_DIST+= $(SCREENSHOTS) doc/doc-make.in doc/screengrab