[gnome-builder] build: drop libgnome-builder.la from gnome-builder binary

[Christian Hergert <chergert src gnome org>]

commit 4ea069841b86b2673e52c29a379bc9e73a5f3383
Author: Christian Hergert <chergert redhat com>
Date:   Sun Nov 15 21:00:53 2015 -0800

    build: drop libgnome-builder.la from gnome-builder binary
    
    We will drop the rest as we migrate to libide.

 data/ui/ide-layout-stack.ui               |    2 +-
 libide/resources/libide.gresource.xml     |   84 +++++++++++++++++-----------
 src/Makefile.am                           |    2 +-
 src/resources/gnome-builder.gresource.xml |   14 -----
 4 files changed, 53 insertions(+), 49 deletions(-)
---
diff --git a/data/ui/ide-layout-stack.ui b/data/ui/ide-layout-stack.ui
index 63561b5..2f51f5b 100644
--- a/data/ui/ide-layout-stack.ui
+++ b/data/ui/ide-layout-stack.ui
@@ -243,7 +243,7 @@
         <property name="orientation">vertical</property>
         <property name="visible">true</property>
         <child>
-          <object class="GbScrolledWindow">
+          <object class="EggScrolledWindow">
             <property name="max-content-height">400</property>
             <property name="min-content-height">30</property>
             <property name="min-content-width">100</property>
diff --git a/libide/resources/libide.gresource.xml b/libide/resources/libide.gresource.xml
index 862ed5b..45c63af 100644
--- a/libide/resources/libide.gresource.xml
+++ b/libide/resources/libide.gresource.xml
@@ -1,43 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/libide">
-    <file alias="snippets/c.snippets">../../data/snippets/c.snippets</file>
-    <file alias="snippets/chdr.snippets">../../data/snippets/chdr.snippets</file>
-    <file alias="snippets/gobject.snippets">../../data/snippets/gobject.snippets</file>
-    <file alias="snippets/licenses.snippets">../../data/snippets/licenses.snippets</file>
-    <file alias="snippets/main.snippets">../../data/snippets/main.snippets</file>
-    <file alias="snippets/python.snippets">../../data/snippets/python.snippets</file>
-    <file alias="snippets/rpmspec.snippets">../../data/snippets/rpmspec.snippets</file>
-    <file alias="snippets/shebang.snippets">../../data/snippets/shebang.snippets</file>
-    <file alias="snippets/vala.snippets">../../data/snippets/vala.snippets</file>
-    <file alias="snippets/xml.snippets">../../data/snippets/xml.snippets</file>
+  <gresource prefix="/org/gnome/libide/snippets">
+    <file alias="c.snippets">../../data/snippets/c.snippets</file>
+    <file alias="chdr.snippets">../../data/snippets/chdr.snippets</file>
+    <file alias="gobject.snippets">../../data/snippets/gobject.snippets</file>
+    <file alias="licenses.snippets">../../data/snippets/licenses.snippets</file>
+    <file alias="main.snippets">../../data/snippets/main.snippets</file>
+    <file alias="python.snippets">../../data/snippets/python.snippets</file>
+    <file alias="rpmspec.snippets">../../data/snippets/rpmspec.snippets</file>
+    <file alias="shebang.snippets">../../data/snippets/shebang.snippets</file>
+    <file alias="vala.snippets">../../data/snippets/vala.snippets</file>
+    <file alias="xml.snippets">../../data/snippets/xml.snippets</file>
+  </gresource>
+
+  <gresource prefix="/org/gnome/builder/gtk">
+    <file alias="menus.ui">../../data/gtk/menus.ui</file>
+  </gresource>
 
-    <file alias="modelines/language-mappings">../modelines/language-mappings</file>
+  <gresource prefix="/org/gnome/builder/theme">
+    <file alias="Adwaita.css">../../data/theme/Adwaita.css</file>
+    <file alias="Adwaita-dark.css">../../data/theme/Adwaita-dark.css</file>
+    <file alias="Adwaita-shared.css">../../data/theme/Adwaita-shared.css</file>
+    <file alias="shared.css">../../data/theme/shared.css</file>
+  </gresource>
 
-    <file alias="file-settings/defaults.ini">../../data/file-settings/defaults.ini</file>
+  <gresource prefix="/org/gnome/libide/modelines">
+    <file alias="language-mappings">../modelines/language-mappings</file>
+  </gresource>
 
-    <file alias="keybindings/emacs.css">../../data/keybindings/emacs.css</file>
-    <file alias="keybindings/vim.css">../../data/keybindings/vim.css</file>
+  <gresource prefix="/org/gnome/libide/file-settings">
+    <file alias="defaults.ini">../../data/file-settings/defaults.ini</file>
+  </gresource>
 
+  <gresource prefix="/org/gnome/builder/keybindings">
+    <file alias="default.css">../../data/keybindings/default.css</file>
+    <file alias="emacs.css">../../data/keybindings/emacs.css</file>
+    <file alias="shared.css">../../data/keybindings/shared.css</file>
+    <file alias="vim.css">../../data/keybindings/vim.css</file>
   </gresource>
 
-  <gresource prefix="/org/gnome/builder">
-    <file alias="ui/ide-editor-perspective.ui">../../data/ui/ide-editor-perspective.ui</file>
-    <file alias="ui/ide-greeter-perspective.ui">../../data/ui/ide-greeter-perspective.ui</file>
-    <file alias="ui/ide-greeter-project-row.ui">../../data/ui/ide-greeter-project-row.ui</file>
-    <file alias="ui/ide-layout.ui">../../data/ui/ide-layout.ui</file>
-    <file alias="ui/ide-layout-pane.ui">../../data/ui/ide-layout-pane.ui</file>
-    <file alias="ui/ide-layout-stack.ui">../../data/ui/ide-layout-stack.ui</file>
-    <file alias="ui/ide-layout-view.ui">../../data/ui/ide-layout-view.ui</file>
-    <file alias="ui/ide-preferences-entry.ui">../../data/ui/ide-preferences-entry.ui</file>
-    <file alias="ui/ide-preferences-font-button.ui">../../data/ui/ide-preferences-font-button.ui</file>
-    <file alias="ui/ide-preferences-group.ui">../../data/ui/ide-preferences-group.ui</file>
-    <file alias="ui/ide-preferences-language-row.ui">../../data/ui/ide-preferences-language-row.ui</file>
-    <file alias="ui/ide-preferences-page.ui">../../data/ui/ide-preferences-page.ui</file>
-    <file alias="ui/ide-preferences-perspective.ui">../../data/ui/ide-preferences-perspective.ui</file>
-    <file alias="ui/ide-preferences-spin-button.ui">../../data/ui/ide-preferences-spin-button.ui</file>
-    <file alias="ui/ide-preferences-switch.ui">../../data/ui/ide-preferences-switch.ui</file>
-    <file alias="ui/ide-workbench-header-bar.ui">../../data/ui/ide-workbench-header-bar.ui</file>
-    <file alias="ui/ide-workbench.ui">../../data/ui/ide-workbench.ui</file>
+  <gresource prefix="/org/gnome/builder/ui">
+    <file alias="ide-editor-perspective.ui">../../data/ui/ide-editor-perspective.ui</file>
+    <file alias="ide-greeter-perspective.ui">../../data/ui/ide-greeter-perspective.ui</file>
+    <file alias="ide-greeter-project-row.ui">../../data/ui/ide-greeter-project-row.ui</file>
+    <file alias="ide-layout.ui">../../data/ui/ide-layout.ui</file>
+    <file alias="ide-layout-pane.ui">../../data/ui/ide-layout-pane.ui</file>
+    <file alias="ide-layout-stack.ui">../../data/ui/ide-layout-stack.ui</file>
+    <file alias="ide-layout-view.ui">../../data/ui/ide-layout-view.ui</file>
+    <file alias="ide-preferences-entry.ui">../../data/ui/ide-preferences-entry.ui</file>
+    <file alias="ide-preferences-font-button.ui">../../data/ui/ide-preferences-font-button.ui</file>
+    <file alias="ide-preferences-group.ui">../../data/ui/ide-preferences-group.ui</file>
+    <file alias="ide-preferences-language-row.ui">../../data/ui/ide-preferences-language-row.ui</file>
+    <file alias="ide-preferences-page.ui">../../data/ui/ide-preferences-page.ui</file>
+    <file alias="ide-preferences-perspective.ui">../../data/ui/ide-preferences-perspective.ui</file>
+    <file alias="ide-preferences-spin-button.ui">../../data/ui/ide-preferences-spin-button.ui</file>
+    <file alias="ide-preferences-switch.ui">../../data/ui/ide-preferences-switch.ui</file>
+    <file alias="ide-workbench-header-bar.ui">../../data/ui/ide-workbench-header-bar.ui</file>
+    <file alias="ide-workbench.ui">../../data/ui/ide-workbench.ui</file>
   </gresource>
 </gresources>
diff --git a/src/Makefile.am b/src/Makefile.am
index e6bb8e1..e2ebef4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -277,8 +277,8 @@ gnome_builder_CFLAGS = $(libgnome_builder_la_CFLAGS)
 gnome_builder_LDADD = \
        $(BUILDER_LIBS) \
        $(top_builddir)/contrib/egg/libegg-private.la \
+       $(top_builddir)/data/icons/hicolor/libicons.la \
        $(top_builddir)/libide/libide-1.0.la \
-       libgnome-builder.la \
        $(NULL)
 gnome_builder_LDFLAGS = \
        -export-dynamic \
diff --git a/src/resources/gnome-builder.gresource.xml b/src/resources/gnome-builder.gresource.xml
index 3cf649e..f2ff6f8 100644
--- a/src/resources/gnome-builder.gresource.xml
+++ b/src/resources/gnome-builder.gresource.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/builder">
-    <file alias="gtk/menus.ui">../../data/gtk/menus.ui</file>
 
-    <file alias="markdown/markdown.css">../../data/markdown/markdown.css</file>
-    <file alias="markdown/marked.js">../../data/markdown/marked.js</file>
-    <file alias="markdown/markdown-view.js">../../data/markdown/markdown-view.js</file>
-
-    <file alias="keybindings/default.css">../../data/keybindings/default.css</file>
-    <file alias="keybindings/emacs.css">../../data/keybindings/emacs.css</file>
-    <file alias="keybindings/shared.css">../../data/keybindings/shared.css</file>
-    <file alias="keybindings/vim.css">../../data/keybindings/vim.css</file>
-
-    <file alias="theme/Adwaita.css">../../data/theme/Adwaita.css</file>
-    <file alias="theme/Adwaita-dark.css">../../data/theme/Adwaita-dark.css</file>
-    <file alias="theme/Adwaita-shared.css">../../data/theme/Adwaita-shared.css</file>
-    <file alias="theme/shared.css">../../data/theme/shared.css</file>
 
     <file alias="ui/gb-editor-frame.ui">../../data/ui/gb-editor-frame.ui</file>
     <file alias="ui/gb-editor-settings-widget.ui">../../data/ui/gb-editor-settings-widget.ui</file>