From 8fedd452487aaee9ed4be69927f6895c9623e7ce Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 17 Oct 2020 09:36:20 +0200 Subject: [PATCH] Move org.fsf.pspp.* to doc org.fsf.pspp.desktop and org.fsf.pspp.metainfo.xml are not part of the user interface per se. Rather, they are documentation --- doc/automake.mk | 24 +++++++++++++++++++ {src/ui/gui => doc}/org.fsf.pspp.desktop.in | 0 .../gui => doc}/org.fsf.pspp.metainfo.xml.in | 0 po/automake.mk | 8 +++---- src/ui/gui/automake.mk | 20 ---------------- 5 files changed, 28 insertions(+), 24 deletions(-) rename {src/ui/gui => doc}/org.fsf.pspp.desktop.in (100%) rename {src/ui/gui => doc}/org.fsf.pspp.metainfo.xml.in (100%) diff --git a/doc/automake.mk b/doc/automake.mk index 990a8c458b..ccff271ef3 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -177,3 +177,27 @@ html-local: install-html-local: html-local $(MKDIR_P) $(DESTDIR)$(prefix)/share/doc/pspp/pspp.html $(INSTALL_DATA) ${top_srcdir}/doc/pspp-manual.css $(DESTDIR)$(prefix)/share/doc/pspp/pspp.html + + + + +mimedir = $(datadir)/mime/packages +desktopdir = $(datadir)/applications + +doc/org.fsf.pspp.metainfo.xml: doc/org.fsf.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) + $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po + +CLEANFILES+=doc/org.fsf.pspp.desktop \ + doc/org.fsf.pspp.metainfo.xml + +desktop_DATA = doc/org.fsf.pspp.desktop + +appdatadir = $(datadir)/metainfo +dist_appdata_DATA = doc/org.fsf.pspp.metainfo.xml + +EXTRA_DIST += doc/org.fsf.pspp.metainfo.xml.in \ + doc/org.fsf.pspp.desktop.in diff --git a/src/ui/gui/org.fsf.pspp.desktop.in b/doc/org.fsf.pspp.desktop.in similarity index 100% rename from src/ui/gui/org.fsf.pspp.desktop.in rename to doc/org.fsf.pspp.desktop.in diff --git a/src/ui/gui/org.fsf.pspp.metainfo.xml.in b/doc/org.fsf.pspp.metainfo.xml.in similarity index 100% rename from src/ui/gui/org.fsf.pspp.metainfo.xml.in rename to doc/org.fsf.pspp.metainfo.xml.in diff --git a/po/automake.mk b/po/automake.mk index d14956e92e..0e83674ca8 100644 --- a/po/automake.mk +++ b/po/automake.mk @@ -57,15 +57,15 @@ XGETTEXT_OPTIONS = \ ALL_TRANSLATABLE_FILES = \ $(TRANSLATABLE_FILES) \ $(UI_FILES) \ - src/ui/gui/org.fsf.pspp.metainfo.xml.in \ - src/ui/gui/org.fsf.pspp.desktop.in + doc/org.fsf.pspp.metainfo.xml.in \ + doc/org.fsf.pspp.desktop.in $(POTFILE): $(ALL_TRANSLATABLE_FILES) Makefile @$(MKDIR_P) po $(AM_V_GEN)$(XGETTEXT) $(XGETTEXT_OPTIONS) $(TRANSLATABLE_FILES) --language=C --keyword=_ --keyword=N_ -o $@,tmp $(AM_V_at)test -z "$(UI_FILES)" || $(XGETTEXT) $(XGETTEXT_OPTIONS) -j $(UI_FILES) --language=Glade -o $@,tmp - $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j src/ui/gui/org.fsf.pspp.metainfo.xml.in -o $@,tmp - $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j src/ui/gui/org.fsf.pspp.desktop.in -o $@,tmp + $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.fsf.pspp.metainfo.xml.in -o $@,tmp + $(AM_V_at)$(XGETTEXT) $(XGETTEXT_OPTIONS) -j doc/org.fsf.pspp.desktop.in -o $@,tmp $(AM_V_at)$(SED) -e '/^"POT-Creation-Date: .*/d' $@,tmp > $@ rm -f $@,tmp diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 2ca50a89da..ad44170170 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -72,8 +72,6 @@ UI_FILES = \ if building_gui EXTRA_DIST += \ - src/ui/gui/org.fsf.pspp.metainfo.xml.in \ - src/ui/gui/org.fsf.pspp.desktop.in \ src/ui/gui/marshaller-list \ src/ui/gui/pspplogo.svg @@ -372,16 +370,6 @@ nodist_src_ui_gui_psppire_SOURCES = \ AM_CPPFLAGS += -Isrc -src/ui/gui/org.fsf.pspp.metainfo.xml: src/ui/gui/org.fsf.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 - -src/ui/gui/org.fsf.pspp.desktop: src/ui/gui/org.fsf.pspp.desktop.in $(POFILES) - $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po - -CLEANFILES+=src/ui/gui/org.fsf.pspp.desktop \ - src/ui/gui/org.fsf.pspp.metainfo.xml - src/ui/gui/resources.c: src/ui/gui/resources.xml $(AM_V_at)$(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src/ui/gui --generate-source $< --target=$@,out $(AM_V_GEN)echo '#include ' > $@,tmp @@ -396,14 +384,6 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@ -mimedir = $(datadir)/mime/packages - -desktopdir = $(datadir)/applications -desktop_DATA = src/ui/gui/org.fsf.pspp.desktop - -appdatadir = $(datadir)/metainfo -dist_appdata_DATA = src/ui/gui/org.fsf.pspp.metainfo.xml - BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/ui/gui/resources.c CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \ -- 2.30.2