[gnome-builder] build: install icons to hicolor theme directory.

[Christian Hergert <chergert src gnome org>]

commit 8de138d4a2cff9f6dabe399380599bb5c75d553e
Author: Christian Hergert <christian hergert me>
Date:   Thu Sep 11 13:52:21 2014 -0700

    build: install icons to hicolor theme directory.

 Makefile.am                                       |    5 ++++
 configure.ac                                      |    2 +-
 data/data.mk                                      |    6 ++++
 data/icons/Makefile.am                            |   27 +++++++++++++++++++++
 data/icons/{ => hicolor}/16x16/apps/builder.png   |  Bin 1149 -> 1149 bytes
 data/icons/{ => hicolor}/24x24/apps/builder.png   |  Bin 1638 -> 1638 bytes
 data/icons/{ => hicolor}/256x256/apps/builder.png |  Bin 50377 -> 50377 bytes
 data/icons/{ => hicolor}/32x32/apps/builder.png   |  Bin 2663 -> 2663 bytes
 data/icons/{ => hicolor}/48x48/apps/builder.png   |  Bin 3857 -> 3857 bytes
 data/icons/{ => hicolor}/512x512/apps/builder.png |  Bin 164777 -> 164777 bytes
 data/icons/{ => hicolor}/source.blend             |  Bin 3810584 -> 3810584 bytes
 data/icons/{ => hicolor}/source.svg               |    0
 {src => data}/org.gnome.Builder.desktop           |    2 +-
 src/gnome-builder.mk                              |    3 --
 src/main.c                                        |    4 +--
 src/resources/ui/gb-workbench.ui                  |    1 +
 16 files changed, 42 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 49749dd..1689d65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,3 +5,8 @@ include build/autotools/automake/AutomakeDocs.mk
 ACLOCAL_AMFLAGS = -I build/autotools/m4 ${ACLOCAL_FLAGS}
 
 include src/gnome-builder.mk
+include data/data.mk
+
+# XXX: Not happy about this, need to come up with a good way to do
+# icon installation that doesn't require subdirs.
+SUBDIRS = . data/icons
diff --git a/configure.ac b/configure.ac
index 0a30b4a..ac50036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ GTK_DOC_CHECK
 ])
 
 # Define our known config files.
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile data/icons/Makefile])
 
 # Last change to configure things and write configuration files.
 m4_include([build/autotools/autoconf.d/pre-output.m4])
diff --git a/data/data.mk b/data/data.mk
new file mode 100644
index 0000000..8542ed2
--- /dev/null
+++ b/data/data.mk
@@ -0,0 +1,6 @@
+
+# Desktop launcher and description file.
+data_desktopdir = $(datadir)/applications
+data_desktop_DATA = data/org.gnome.Builder.desktop
+EXTRA_DIST += $(data_desktop_DATA)
+
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 0000000..1898a67
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,27 @@
+
+icondir = $(datadir)/icons
+
+nobase_icon_DATA = \
+       hicolor/256x256/apps/builder.png \
+       hicolor/512x512/apps/builder.png \
+       hicolor/16x16/apps/builder.png \
+       hicolor/32x32/apps/builder.png \
+       hicolor/48x48/apps/builder.png \
+       hicolor/24x24/apps/builder.png
+
+EXTRA_DIST = \
+       $(nobase_icon_DATA) \
+       hicolor/source.svg
+
+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/data/icons/source.svg b/data/icons/hicolor/source.svg
similarity index 100%
rename from data/icons/source.svg
rename to data/icons/hicolor/source.svg
diff --git a/src/org.gnome.Builder.desktop b/data/org.gnome.Builder.desktop
similarity index 91%
rename from src/org.gnome.Builder.desktop
rename to data/org.gnome.Builder.desktop
index cd38473..4b33954 100644
--- a/src/org.gnome.Builder.desktop
+++ b/data/org.gnome.Builder.desktop
@@ -2,7 +2,7 @@
 Name=Builder
 Comment=Build software for GNOME
 Exec=gnome-builder
-Icon=gnome-builder
+Icon=builder
 DBusActivatable=true
 StartupNotify=true
 Terminal=false
diff --git a/src/gnome-builder.mk b/src/gnome-builder.mk
index 3882cbf..2c519aa 100644
--- a/src/gnome-builder.mk
+++ b/src/gnome-builder.mk
@@ -128,6 +128,3 @@ src/resources/gb-resources.h: src/resources/gnome-builder.gresource.xml $(resour
 
 EXTRA_DIST += $(resource_files)
 
-data_desktopdir = $(datadir)/applications
-data_desktop_DATA = src/org.gnome.Builder.desktop
-EXTRA_DIST += $(data_desktop_DATA)
diff --git a/src/main.c b/src/main.c
index 7f9b37c..b2d1d14 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,15 +31,13 @@ main (int   argc,
   int ret;
 
   g_set_prgname ("gnome-builder");
-  g_set_application_name (_ ("Builder"));
+  g_set_application_name (_("Builder"));
 
   gb_log_init (TRUE, NULL);
 
   app = gb_application_new ();
   g_application_set_default (G_APPLICATION (app));
-
   ret = g_application_run (G_APPLICATION (app), argc, argv);
-
   g_clear_object (&app);
 
   gb_log_shutdown ();
diff --git a/src/resources/ui/gb-workbench.ui b/src/resources/ui/gb-workbench.ui
index 82b6811..49b1e8a 100644
--- a/src/resources/ui/gb-workbench.ui
+++ b/src/resources/ui/gb-workbench.ui
@@ -2,6 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 3.8 -->
   <template class="GbWorkbench" parent="GtkApplicationWindow">
+    <property name="icon-name">builder</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>