From 0392ad057d79a256246108eab35e9a11bfee8493 Mon Sep 17 00:00:00 2001 From: compyx Date: Mon, 24 Feb 2025 09:51:13 +0000 Subject: [PATCH] Fix inclusion of icon files in dist tarball All the Windows/Gtk/SDL/desktop-files/include-x64 conditionals in the Makefile led to the icon files only ending up in dists configured for Gtk3. Should be fixed now. git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45505 379a1393-f5fb-40a0-bcee-ef074d9b53f7 --- vice/data/common/Makefile.am | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/vice/data/common/Makefile.am b/vice/data/common/Makefile.am index 6ee70a0db8..1d7281d494 100644 --- a/vice/data/common/Makefile.am +++ b/vice/data/common/Makefile.am @@ -380,8 +380,11 @@ install-data-hook: install-icons install-desktop-files uninstall-hook: uninstall-icons uninstall-desktop-files update-desktop-database +# if INSTALL_DESKTOP_FILES endif +# if USE_GTK3UI +endif # Everything goes into a source dist EXTRA_DIST = $(icon_files) \ @@ -403,7 +406,11 @@ EXTRA_DIST = $(icon_files) \ vice.gresource.xml +if USE_GTK3UI CLEANFILES = $(GRESOURCE_TARGET) +else +CLEANFILES = +endif if WINDOWS_COMPILE # The *.ico and *.res files are currently generated in @@ -433,5 +440,3 @@ CLEANFILES += \ xcbm5x0.res \ vsid.res endif - -endif