From d4a7e71a0f043d2f2df3f4a30b1ade04ee280e1c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 28 Oct 2022 19:36:23 +0300 Subject: [PATCH 24/24] Generate .desktop under bootstrap/ See osdn #45983 Signed-off-by: Marko Lindqvist --- bootstrap/Makefile.am | 11 +++++++++++ client/Makefile.am | 8 -------- configure.ac | 18 +++++++++--------- server/Makefile.am | 3 --- tools/fcmp/Makefile.am | 16 ---------------- tools/ruledit/Makefile.am | 3 --- 6 files changed, 20 insertions(+), 39 deletions(-) diff --git a/bootstrap/Makefile.am b/bootstrap/Makefile.am index c5d7da795d..82934b5a40 100644 --- a/bootstrap/Makefile.am +++ b/bootstrap/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in metainfofiledir = @METAINFODIR@ +desktopfiledir = @DESKTOPDIR@ ## Automake should distribute config.rpath automatically - and new ## versions probably do. We still support versions that do not, so @@ -44,41 +45,51 @@ EXTRA_DIST = freeciv.project \ langnames.txt metainfofile_DATA = +desktopfile_DATA = if SERVER metainfofile_DATA += org.freeciv.server.metainfo.xml +desktopfile_DATA += org.freeciv.server.desktop endif if CLIENT_GUI_SDL2 metainfofile_DATA += org.freeciv.sdl2.metainfo.xml +desktopfile_DATA += org.freeciv.sdl2.desktop endif if CLIENT_GUI_GTK_3_22 metainfofile_DATA += org.freeciv.gtk322.metainfo.xml +desktopfile_DATA += org.freeciv.gtk322.desktop endif if CLIENT_GUI_GTK_4 metainfofile_DATA += org.freeciv.gtk4.metainfo.xml +desktopfile_DATA += org.freeciv.gtk4.desktop endif if CLIENT_GUI_QT metainfofile_DATA += org.freeciv.qt.metainfo.xml +desktopfile_DATA += org.freeciv.qt.desktop endif if MODINST_GTK3 metainfofile_DATA += org.freeciv.mp.gtk3.metainfo.xml +desktopfile_DATA += org.freeciv.mp.gtk3.desktop endif if MODINST_GTK4 metainfofile_DATA += org.freeciv.mp.gtk4.metainfo.xml +desktopfile_DATA += org.freeciv.mp.gtk4.desktop endif if MODINST_QT metainfofile_DATA += org.freeciv.mp.qt.metainfo.xml +desktopfile_DATA += org.freeciv.mp.qt.desktop endif if RULEDIT metainfofile_DATA += org.freeciv.ruledit.metainfo.xml +desktopfile_DATA += org.freeciv.ruledit.desktop endif langstat_core.txt: diff --git a/client/Makefile.am b/client/Makefile.am index c2cd0eb8ee..781e70aa41 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -3,28 +3,20 @@ ## Must be set before adding anything GUI_SUBDIRS = -desktopfiledir = @DESKTOPDIR@ - -desktopfile_DATA = - if CLIENT_GUI_SDL2 GUI_SUBDIRS += gui-sdl2 -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 endif if CLIENT_GUI_GTK_4 GUI_SUBDIRS += gui-gtk-4.0 -desktopfile_DATA += org.freeciv.gtk4.desktop endif if CLIENT_GUI_QT GUI_SUBDIRS += gui-qt -desktopfile_DATA += org.freeciv.qt.desktop endif if CLIENT_GUI_STUB diff --git a/configure.ac b/configure.ac index 8f8d6610a7..dfa8291a44 100644 --- a/configure.ac +++ b/configure.ac @@ -1890,15 +1890,15 @@ AC_CONFIG_FILES([Makefile doc/sv/Makefile bootstrap/Makefile lua/Makefile - client/org.freeciv.gtk322.desktop:bootstrap/org.freeciv.gtk322.desktop.in - client/org.freeciv.gtk4.desktop:bootstrap/org.freeciv.gtk4.desktop.in - client/org.freeciv.sdl2.desktop:bootstrap/org.freeciv.sdl2.desktop.in - client/org.freeciv.qt.desktop:bootstrap/org.freeciv.qt.desktop.in - server/org.freeciv.server.desktop:bootstrap/org.freeciv.server.desktop.in - tools/fcmp/org.freeciv.mp.gtk3.desktop:bootstrap/org.freeciv.mp.gtk3.desktop.in - 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]) + bootstrap/org.freeciv.gtk322.desktop:bootstrap/org.freeciv.gtk322.desktop.in + bootstrap/org.freeciv.gtk4.desktop:bootstrap/org.freeciv.gtk4.desktop.in + bootstrap/org.freeciv.sdl2.desktop:bootstrap/org.freeciv.sdl2.desktop.in + bootstrap/org.freeciv.qt.desktop:bootstrap/org.freeciv.qt.desktop.in + bootstrap/org.freeciv.server.desktop:bootstrap/org.freeciv.server.desktop.in + bootstrap/org.freeciv.mp.gtk3.desktop:bootstrap/org.freeciv.mp.gtk3.desktop.in + bootstrap/org.freeciv.mp.gtk4.desktop:bootstrap/org.freeciv.mp.gtk4.desktop.in + bootstrap/org.freeciv.mp.qt.desktop:bootstrap/org.freeciv.mp.qt.desktop.in + bootstrap/org.freeciv.ruledit.desktop:bootstrap/org.freeciv.ruledit.desktop.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 7f95d8e140..0080912783 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -180,6 +180,3 @@ freeciv_server_SOURCES = $(exe_sources) freeciv_server_LDFLAGS = $(exe_ldflags) freeciv_server_LDADD = $(exe_ldadd) endif - -desktopfiledir = @DESKTOPDIR@ -desktopfile_DATA = org.freeciv.server.desktop diff --git a/tools/fcmp/Makefile.am b/tools/fcmp/Makefile.am index 415b559029..9a5de8b5f7 100644 --- a/tools/fcmp/Makefile.am +++ b/tools/fcmp/Makefile.am @@ -39,22 +39,6 @@ AM_CPPFLAGS = $(common_cppflags) if MINGW MPICON = $(top_builddir)/windows/mpicon.o -else -desktopfiledir = @DESKTOPDIR@ -desktopfile_DATA = - -if MODINST_GTK3 -desktopfile_DATA += org.freeciv.mp.gtk3.desktop -endif - -if MODINST_GTK4 -desktopfile_DATA += org.freeciv.mp.gtk4.desktop -endif - -if MODINST_QT -desktopfile_DATA += org.freeciv.mp.qt.desktop -endif - endif libfcmp_la_SOURCES = \ diff --git a/tools/ruledit/Makefile.am b/tools/ruledit/Makefile.am index fecb572e9d..44d0288c1e 100644 --- a/tools/ruledit/Makefile.am +++ b/tools/ruledit/Makefile.am @@ -8,9 +8,6 @@ if MINGW REICON = $(top_builddir)/windows/rulediticon.o endif -desktopfiledir = @DESKTOPDIR@ -desktopfile_DATA = org.freeciv.ruledit.desktop - bin_PROGRAMS = freeciv-ruledit AM_CPPFLAGS = \ -- 2.35.1