Skip to content

Commit

Permalink
Fix inclusion of icon files in dist tarball
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Compyx committed Feb 24, 2025
1 parent adcb960 commit 0392ad0
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions vice/data/common/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand All @@ -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
Expand Down Expand Up @@ -433,5 +440,3 @@ CLEANFILES += \
xcbm5x0.res \
vsid.res
endif

endif

0 comments on commit 0392ad0

Please sign in to comment.