diff options
author | Patrick Griffis <tingping@tingping.se> | 2015-12-26 22:16:45 -0500 |
---|---|---|
committer | Patrick Griffis <tingping@tingping.se> | 2016-01-19 19:35:10 -0500 |
commit | 6859636f60259eee7bf8293eb0434c54cb250880 (patch) | |
tree | 7256c75c56e6dd8c030ae529eceb9694dc03e341 | |
parent | a58b32a5b362f5059c697d9ff39b7fcee536a4df (diff) |
Move icons to data dir
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | data/Makefile.am | 1 | ||||
-rw-r--r-- | data/icons/Makefile.am | 25 | ||||
-rw-r--r-- | data/icons/hicolor/16x16/apps/transmission-remote-gtk.png (renamed from src/hicolor_apps_16x16_transmission-remote-gtk.png) | bin | 838 -> 838 bytes | |||
-rw-r--r-- | data/icons/hicolor/22x22/apps/transmission-remote-gtk.png (renamed from src/hicolor_apps_22x22_transmission-remote-gtk.png) | bin | 1207 -> 1207 bytes | |||
-rw-r--r-- | data/icons/hicolor/24x24/apps/transmission-remote-gtk.png (renamed from src/hicolor_apps_24x24_transmission-remote-gtk.png) | bin | 1200 -> 1200 bytes | |||
-rw-r--r-- | data/icons/hicolor/32x32/apps/transmission-remote-gtk.png (renamed from src/hicolor_apps_32x32_transmission-remote-gtk.png) | bin | 1881 -> 1881 bytes | |||
-rw-r--r-- | data/icons/hicolor/48x48/apps/transmission-remote-gtk.png (renamed from src/hicolor_apps_48x48_transmission-remote-gtk.png) | bin | 2683 -> 2683 bytes | |||
-rw-r--r-- | data/icons/hicolor/scalable/apps/transmission-remote-gtk.svg (renamed from src/hicolor_apps_scalable_transmission-remote-gtk.svg) | 0 | ||||
-rw-r--r-- | src/Makefile.am | 49 |
11 files changed, 29 insertions, 50 deletions
diff --git a/Makefile.am b/Makefile.am index f0b6dfd..5260ca5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign -SUBDIRS = extern src po +SUBDIRS = extern src po data DISTCLEANFILES = \ intltool-extract \ diff --git a/configure.ac b/configure.ac index 84e412f..858c4e8 100644 --- a/configure.ac +++ b/configure.ac @@ -150,6 +150,8 @@ AC_CONFIG_FILES([ src/Makefile extern/Makefile extern/rss-glib/Makefile + data/Makefile + data/icons/Makefile ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..61a1a63 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = icons diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am new file mode 100644 index 0000000..24bb442 --- /dev/null +++ b/data/icons/Makefile.am @@ -0,0 +1,25 @@ + +icondir = $(datadir)/icons +nobase_icon_DATA = \ + hicolor/16x16/apps/transmission-remote-gtk.png \ + hicolor/22x22/apps/transmission-remote-gtk.png \ + hicolor/24x24/apps/transmission-remote-gtk.png \ + hicolor/32x32/apps/transmission-remote-gtk.png \ + hicolor/48x48/apps/transmission-remote-gtk.png \ + hicolor/scalable/apps/transmission-remote-gtk.svg + +EXTRA_DIST = $(nobase_icon_DATA) + +gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor + +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache +update-icon-cache: + @-if test -z "$(DESTDIR)"; then \ + echo "Updating Gtk icon cache."; \ + $(gtk_update_icon_cache); \ + else \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ + echo "*** $(gtk_update_icon_cache)"; \ + fi + diff --git a/src/hicolor_apps_16x16_transmission-remote-gtk.png b/data/icons/hicolor/16x16/apps/transmission-remote-gtk.png Binary files differindex 78b1af2..78b1af2 100644 --- a/src/hicolor_apps_16x16_transmission-remote-gtk.png +++ b/data/icons/hicolor/16x16/apps/transmission-remote-gtk.png diff --git a/src/hicolor_apps_22x22_transmission-remote-gtk.png b/data/icons/hicolor/22x22/apps/transmission-remote-gtk.png Binary files differindex 3283ea2..3283ea2 100644 --- a/src/hicolor_apps_22x22_transmission-remote-gtk.png +++ b/data/icons/hicolor/22x22/apps/transmission-remote-gtk.png diff --git a/src/hicolor_apps_24x24_transmission-remote-gtk.png b/data/icons/hicolor/24x24/apps/transmission-remote-gtk.png Binary files differindex 6200ec0..6200ec0 100644 --- a/src/hicolor_apps_24x24_transmission-remote-gtk.png +++ b/data/icons/hicolor/24x24/apps/transmission-remote-gtk.png diff --git a/src/hicolor_apps_32x32_transmission-remote-gtk.png b/data/icons/hicolor/32x32/apps/transmission-remote-gtk.png Binary files differindex d3d6464..d3d6464 100644 --- a/src/hicolor_apps_32x32_transmission-remote-gtk.png +++ b/data/icons/hicolor/32x32/apps/transmission-remote-gtk.png diff --git a/src/hicolor_apps_48x48_transmission-remote-gtk.png b/data/icons/hicolor/48x48/apps/transmission-remote-gtk.png Binary files differindex 3444de8..3444de8 100644 --- a/src/hicolor_apps_48x48_transmission-remote-gtk.png +++ b/data/icons/hicolor/48x48/apps/transmission-remote-gtk.png diff --git a/src/hicolor_apps_scalable_transmission-remote-gtk.svg b/data/icons/hicolor/scalable/apps/transmission-remote-gtk.svg index e9c4cec..e9c4cec 100644 --- a/src/hicolor_apps_scalable_transmission-remote-gtk.svg +++ b/data/icons/hicolor/scalable/apps/transmission-remote-gtk.svg diff --git a/src/Makefile.am b/src/Makefile.am index f60a61a..2874f70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,21 +17,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -NULL = - -public_icons_themes = \ - hicolor \ - $(NULL) - -public_icons = \ - hicolor_apps_scalable_transmission-remote-gtk.svg \ - hicolor_apps_16x16_transmission-remote-gtk.png \ - hicolor_apps_24x24_transmission-remote-gtk.png \ - hicolor_apps_48x48_transmission-remote-gtk.png \ - hicolor_apps_22x22_transmission-remote-gtk.png \ - hicolor_apps_32x32_transmission-remote-gtk.png \ - $(NULL) - if !WIN32 EXTRA_DIST = transmission-remote-gtk.desktop.in transmission-remote-gtk.pod transmission-remote-gtk.appdata.xml CLEANFILES = transmission-remote-gtk.desktop transmission-remote-gtk.1 @@ -133,40 +118,6 @@ else pod2man --release="" --center="Transmission Remote GTK" $< > $@ endif -install-data-local: install-icons update-icon-cache - -gtk_update_icon_cache = gtk-update-icon-cache -f -t - -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - for theme in $(public_icons_themes); do \ - $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ - done; \ - else \ - echo "*** Icon cache not updated. After (un)install, run this:"; \ - for theme in $(public_icons_themes); do \ - echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ - done; \ - fi - -install-icons: - for icon in $(public_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done; \ - for icon in $(private_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ - SIZE=`echo $$icon | cut -d_ -f3`; \ - ICONFILE=`echo $$icon | cut -d_ -f4`; \ - mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ - done transmission-remote-gtk.desktop: transmission-remote-gtk.desktop.in sed -e 's,@bindir\@,$(bindir),g' <transmission-remote-gtk.desktop.in > $@ |