Fix build of pspp.xml

diff --git a/Makefile.am b/Makefile.am
index 3a71973ca3d635b3feaba04123246d30f16df2ed..565e730171d96499cd7a0e493ca05bbde695a0d7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## PSPP - a program for statistical analysis.
-## Copyright (C) 2019 Free Software Foundation, Inc.
+## Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -66,6 +66,11 @@ PHONY =
 SUFFIXES = .q
 LDADD = gl/libgl.la
 
+gl/libgl.la: config.h
+       $(MAKE) -C gl
+
+dist: gl/libgl.la
+
 # This ensures that files added to EXTRA_DIST are always distributed,
 # even if they are inside an Automake if...endif conditional block that is
 # disabled by some particular "configure" run.  For more information, see:

diff --git a/doc/automake.mk b/doc/automake.mk
index 61a35f9fe339abd0b666e75fadbc716d86aed51a..990a8c458b6d7ca8d46da3e602cac3e44f4ffcb5 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -78,7 +78,7 @@ $(srcdir)/doc/tut.texi:
        $(AM_V_GEN)echo "@set example-dir $(examplesdir)" > $@
 
 
-$(srcdir)/doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) $(top_srcdir)/doc/help-pages-list
+doc/pspp.xml: doc/pspp.texi $(doc_pspp_TEXINFOS) doc/help-pages-list
 if BROKEN_DOCBOOK_XML
        touch $@
 else
@@ -91,13 +91,13 @@ docbookdir = $(docdir)
 dist_docbook_DATA = doc/pspp.xml
 
 
-CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc/pspp.info*
+CLEANFILES += pspp-dev.dvi $(docbook_DATA) doc/pspp.info* doc/pspp.xml
 
 
 doc: $(INFO_DEPS) $(DVIS) $(PDFS) $(PSS) $(HTMLS) $(dist_docbook_DATA)
 PHONY += doc
 
-$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
+doc/help-pages-list: $(UI_FILES)
         $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
    $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
        -e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
@@ -140,6 +140,7 @@ $(top_builddir)/doc/pspp.ps:    $(EXAMPLE_OUTPUTS)
 $(top_builddir)/doc/pspp.dvi:   $(EXAMPLE_OUTPUTS)
 $(top_builddir)/doc/pspp.html:  $(EXAMPLE_HTML)
 $(top_builddir)/doc/pspp.pdf:   $(EXAMPLE_OUTPUTS)
+$(top_builddir)/doc/pspp.xml:   $(EXAMPLE_OUTPUTS)
 
 # The examples cannot be built until the binary has been built
 $(EXAMPLE_OUTPUTS): $(top_builddir)/src/ui/terminal/pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index f169878887f624cb61e7400861c7875cfa1600c4..2ca50a89dad62b5a7fbfc195365d95965c31b845 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -397,8 +397,6 @@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
 mimedir = $(datadir)/mime/packages
-mime_DATA = src/ui/gui/pspp.xml
-EXTRA_DIST += src/ui/gui/pspp.xml
 
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/org.fsf.pspp.desktop

diff --git a/src/ui/gui/pspp.xml b/src/ui/gui/pspp.xml
deleted file mode 100644 (file)
index 4f925c4..0000000
--- a/src/ui/gui/pspp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-spss-sps">
-    <comment>SPSS syntax file</comment>
-    <acronym>SPSS</acronym>
-    <expanded-acronym>Statistical Package for the Social Sciences</expanded-acronym>
-    <glob pattern="*.sps"/>
-  </mime-type>
-  <mime-type type="application/x-spss-spv">
-    <comment>SPSS output file</comment>
-    <acronym>SPSS</acronym>
-    <expanded-acronym>Statistical Package for the Social Sciences</expanded-acronym>
-    <glob pattern="*.spv"/>
-  </mime-type>
-</mime-info>
-