From d3b14efa37b79daae4803bf15b3c3314126e9468 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 12 Oct 2022 17:09:38 +0300 Subject: [PATCH 35/35] Generate .metainfo.xml under bootstrap/ See osdn #45840 Signed-off-by: Marko Lindqvist --- bootstrap/Makefile.am | 40 +++++++++++++++++++++++++++++++++++++++ client/Makefile.am | 32 +++++++++++-------------------- configure.ac | 18 +++++++++--------- server/Makefile.am | 7 +------ tools/fcmp/Makefile.am | 18 +++--------------- tools/ruledit/Makefile.am | 4 +--- 6 files changed, 65 insertions(+), 54 deletions(-) diff --git a/bootstrap/Makefile.am b/bootstrap/Makefile.am index f2355124bd..8477dc3dfc 100644 --- a/bootstrap/Makefile.am +++ b/bootstrap/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +metainfofiledir = @METAINFODIR@ + ## Automake should distribute config.rpath automatically - and new ## versions probably do. We still support versions that do not, so ## it's in the list below. @@ -40,6 +42,44 @@ EXTRA_DIST = freeciv.project \ Makerules.mk \ langnames.txt +metainfofile_DATA = + +if SERVER +metainfofile_DATA += org.freeciv.server.metainfo.xml +endif + +if CLIENT_GUI_SDL2 +metainfofile_DATA += org.freeciv.sdl2.metainfo.xml +endif + +if CLIENT_GUI_GTK_3_22 +metainfofile_DATA += org.freeciv.gtk322.metainfo.xml +endif + +if CLIENT_GUI_GTK_4 +metainfofile_DATA += org.freeciv.gtk4.metainfo.xml +endif + +if CLIENT_GUI_QT +metainfofile_DATA += org.freeciv.qt.metainfo.xml +endif + +if MODINST_GTK3 +metainfofile_DATA += org.freeciv.mp.gtk3.metainfo.xml +endif + +if MODINST_GTK4 +metainfofile_DATA += org.freeciv.mp.gtk4.metainfo.xml +endif + +if MODINST_QT +metainfofile_DATA += org.freeciv.mp.qt.metainfo.xml +endif + +if RULEDIT +metainfofile_DATA += org.freeciv.ruledit.metainfo.xml +endif + langstat_core.txt: "$(top_srcdir)/bootstrap/generate_langstat.sh" core "$(top_srcdir)" "$(top_builddir)/bootstrap" diff --git a/client/Makefile.am b/client/Makefile.am index de64687227..c2cd0eb8ee 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -4,51 +4,41 @@ GUI_SUBDIRS = desktopfiledir = @DESKTOPDIR@ -metainfofiledir = @METAINFODIR@ desktopfile_DATA = -metainfofile_DATA = if CLIENT_GUI_SDL2 GUI_SUBDIRS += gui-sdl2 -desktopfile_DATA += \ - org.freeciv.sdl2.desktop -metainfofile_DATA += \ - org.freeciv.sdl2.metainfo.xml +desktopfile_DATA += org.freeciv.sdl2.desktop endif + if CLIENT_GUI_GTK_3_22 GUI_SUBDIRS += gui-gtk-3.22 -desktopfile_DATA += \ - org.freeciv.gtk322.desktop -metainfofile_DATA += \ - org.freeciv.gtk322.metainfo.xml +desktopfile_DATA += org.freeciv.gtk322.desktop endif + if CLIENT_GUI_GTK_4 GUI_SUBDIRS += gui-gtk-4.0 -desktopfile_DATA += \ - org.freeciv.gtk4.desktop -metainfofile_DATA += \ - org.freeciv.gtk4.metainfo.xml +desktopfile_DATA += org.freeciv.gtk4.desktop endif + if CLIENT_GUI_QT GUI_SUBDIRS += gui-qt -desktopfile_DATA += \ - org.freeciv.qt.desktop -metainfofile_DATA += \ - org.freeciv.qt.metainfo.xml +desktopfile_DATA += org.freeciv.qt.desktop endif + if CLIENT_GUI_STUB GUI_SUBDIRS += gui-stub endif -ALL_AUDIO_SDL_FILES=audio_sdl.c audio_sdl.h +ALL_AUDIO_SDL_FILES = audio_sdl.c audio_sdl.h if AUDIO_SDL -AUDIO_SDL_FILES=$(ALL_AUDIO_SDL_FILES) +AUDIO_SDL_FILES = $(ALL_AUDIO_SDL_FILES) endif if MINGW -CLIENTICON=../windows/clienticon.o +CLIENTICON = ../windows/clienticon.o endif EXTRA_DIST= $(ALL_AUDIO_SDL_FILES) diff --git a/configure.ac b/configure.ac index 5f0649e331..946095c0db 100644 --- a/configure.ac +++ b/configure.ac @@ -1898,15 +1898,15 @@ AC_CONFIG_FILES([Makefile tools/fcmp/org.freeciv.mp.gtk4.desktop:bootstrap/org.freeciv.mp.gtk4.desktop.in tools/fcmp/org.freeciv.mp.qt.desktop:bootstrap/org.freeciv.mp.qt.desktop.in tools/ruledit/org.freeciv.ruledit.desktop:bootstrap/org.freeciv.ruledit.desktop.in - client/org.freeciv.gtk322.metainfo.xml:bootstrap/org.freeciv.gtk322.metainfo.xml.in - client/org.freeciv.gtk4.metainfo.xml:bootstrap/org.freeciv.gtk4.metainfo.xml.in - client/org.freeciv.sdl2.metainfo.xml:bootstrap/org.freeciv.sdl2.metainfo.xml.in - client/org.freeciv.qt.metainfo.xml:bootstrap/org.freeciv.qt.metainfo.xml.in - server/org.freeciv.server.metainfo.xml:bootstrap/org.freeciv.server.metainfo.xml.in - tools/fcmp/org.freeciv.mp.gtk3.metainfo.xml:bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in - tools/fcmp/org.freeciv.mp.gtk4.metainfo.xml:bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in - tools/fcmp/org.freeciv.mp.qt.metainfo.xml:bootstrap/org.freeciv.mp.qt.metainfo.xml.in - tools/ruledit/org.freeciv.ruledit.metainfo.xml:bootstrap/org.freeciv.ruledit.metainfo.xml.in]) + bootstrap/org.freeciv.gtk322.metainfo.xml:bootstrap/org.freeciv.gtk322.metainfo.xml.in + bootstrap/org.freeciv.gtk4.metainfo.xml:bootstrap/org.freeciv.gtk4.metainfo.xml.in + bootstrap/org.freeciv.sdl2.metainfo.xml:bootstrap/org.freeciv.sdl2.metainfo.xml.in + bootstrap/org.freeciv.qt.metainfo.xml:bootstrap/org.freeciv.qt.metainfo.xml.in + bootstrap/org.freeciv.server.metainfo.xml:bootstrap/org.freeciv.server.metainfo.xml.in + bootstrap/org.freeciv.mp.gtk3.metainfo.xml:bootstrap/org.freeciv.mp.gtk3.metainfo.xml.in + bootstrap/org.freeciv.mp.gtk4.metainfo.xml:bootstrap/org.freeciv.mp.gtk4.metainfo.xml.in + bootstrap/org.freeciv.mp.qt.metainfo.xml:bootstrap/org.freeciv.mp.qt.metainfo.xml.in + bootstrap/org.freeciv.ruledit.metainfo.xml:bootstrap/org.freeciv.ruledit.metainfo.xml.in]) AC_CONFIG_FILES([fcgui:bootstrap/fcgui.in], [chmod +x fcgui]) AC_CONFIG_FILES([fcser:bootstrap/fcser.in], [chmod +x fcser]) AC_CONFIG_FILES([fcruleup:bootstrap/fcruleup.in], [chmod +x fcruleup]) diff --git a/server/Makefile.am b/server/Makefile.am index e1f0072f4c..7f95d8e140 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -182,9 +182,4 @@ freeciv_server_LDADD = $(exe_ldadd) endif desktopfiledir = @DESKTOPDIR@ -desktopfile_DATA = \ - org.freeciv.server.desktop - -metainfofiledir = @METAINFODIR@ -metainfofile_DATA = \ - org.freeciv.server.metainfo.xml +desktopfile_DATA = org.freeciv.server.desktop diff --git a/tools/fcmp/Makefile.am b/tools/fcmp/Makefile.am index eedb2471e6..415b559029 100644 --- a/tools/fcmp/Makefile.am +++ b/tools/fcmp/Makefile.am @@ -43,28 +43,16 @@ else desktopfiledir = @DESKTOPDIR@ desktopfile_DATA = -metainfofiledir = @METAINFODIR@ -metainfofile_DATA = - if MODINST_GTK3 -desktopfile_DATA += \ - org.freeciv.mp.gtk3.desktop -metainfofile_DATA += \ - org.freeciv.mp.gtk3.metainfo.xml +desktopfile_DATA += org.freeciv.mp.gtk3.desktop endif if MODINST_GTK4 -desktopfile_DATA += \ - org.freeciv.mp.gtk4.desktop -metainfofile_DATA += \ - org.freeciv.mp.gtk4.metainfo.xml +desktopfile_DATA += org.freeciv.mp.gtk4.desktop endif if MODINST_QT -desktopfile_DATA += \ - org.freeciv.mp.qt.desktop -metainfofile_DATA += \ - org.freeciv.mp.qt.metainfo.xml +desktopfile_DATA += org.freeciv.mp.qt.desktop endif endif diff --git a/tools/ruledit/Makefile.am b/tools/ruledit/Makefile.am index 2e5537e066..fecb572e9d 100644 --- a/tools/ruledit/Makefile.am +++ b/tools/ruledit/Makefile.am @@ -7,12 +7,10 @@ include $(top_srcdir)/bootstrap/Makerules.mk if MINGW REICON = $(top_builddir)/windows/rulediticon.o endif + desktopfiledir = @DESKTOPDIR@ desktopfile_DATA = org.freeciv.ruledit.desktop -metainfofiledir = @METAINFODIR@ -metainfofile_DATA = org.freeciv.ruledit.metainfo.xml - bin_PROGRAMS = freeciv-ruledit AM_CPPFLAGS = \ -- 2.35.1