[polari/wip/resources: 1/3] data: Move gresources to src

[Florian Müllner <fmuellner src gnome org>]

commit 5c4dbcb90dc566b0274f785bd4f63ba17c55d98d
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Oct 31 00:34:23 2013 +0100

    data: Move gresources to src

 .gitignore                                         |    2 +-
 data/Makefile.am                                   |   10 ----------
 po/POTFILES.in                                     |   12 ++++++------
 src/Makefile.am                                    |   10 ++++++++++
 {data => src}/polari.gresource.xml                 |    0
 {data => src}/resources/app-menu.ui                |    0
 {data => src}/resources/application.css            |    0
 .../resources/connection-details-dialog.ui         |    0
 {data => src}/resources/connection-list-dialog.ui  |    0
 {data => src}/resources/join-room-dialog.ui        |    0
 {data => src}/resources/main-window.ui             |    0
 {data => src}/resources/message-user-dialog.ui     |    0
 12 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f12f61..56adedc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ config.*
 configure
 data/appdata/*.appdata.xml
 data/*.desktop
-data/*.gresource
 data/*.gschema.valid
 data/*.gschema.xml
 data/*.service
@@ -37,5 +36,6 @@ po/POTFILES
 po/Rules-quot
 po/polari.pot
 po/stamp-it
+src/*.gresource
 src/config.js
 src/polari
diff --git a/data/Makefile.am b/data/Makefile.am
index 63d778c..1971925 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,26 +16,16 @@ org.gnome.Polari.service: org.gnome.Polari.service.in Makefile
 check-local:
        $(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
 
-resource_files=$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/polari.gresource.xml)
-polari.gresource: polari.gresource.xml $(resource_files)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
-
-resourcedir=$(pkgdatadir)
-resource_DATA=polari.gresource
-
 gsettings_SCHEMAS = org.gnome.polari.gschema.xml
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
        $(desktop_in_files) \
        $(service_in_files) \
-       polari.gresource.xml \
-       $(resource_files) \
        $(gsettings_SCHEMAS) \
        $(NULL)
 
 CLEANFILES = \
        $(desktop_DATA) \
        $(service_DATA) \
-       $(resource_DATA) \
        $(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c10fd5a..bd832e1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,12 @@
 data/appdata/org.gnome.Polari.appdata.xml.in
 data/org.gnome.polari.gschema.xml
 data/org.gnome.Polari.desktop.in
-[type: gettext/glade]data/resources/app-menu.ui
-[type: gettext/glade]data/resources/connection-details-dialog.ui
-[type: gettext/glade]data/resources/connection-list-dialog.ui
-[type: gettext/glade]data/resources/join-room-dialog.ui
-[type: gettext/glade]data/resources/main-window.ui
-[type: gettext/glade]data/resources/message-user-dialog.ui
+[type: gettext/glade]src/resources/app-menu.ui
+[type: gettext/glade]src/resources/connection-details-dialog.ui
+[type: gettext/glade]src/resources/connection-list-dialog.ui
+[type: gettext/glade]src/resources/join-room-dialog.ui
+[type: gettext/glade]src/resources/main-window.ui
+[type: gettext/glade]src/resources/message-user-dialog.ui
 src/application.js
 src/chatView.js
 src/connections.js
diff --git a/src/Makefile.am b/src/Makefile.am
index da04646..75a6ce2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,12 +53,22 @@ nodist_js_DATA = \
        config.js \
        $(NULL)
 
+resource_files=$(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/polari.gresource.xml)
+polari.gresource: polari.gresource.xml $(resource_files)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
+
+resourcedir=$(pkgdatadir)
+resource_DATA=polari.gresource
+
 EXTRA_DIST += \
        config.js.in \
+       polari.gresource.xml \
        polari.in \
+       $(resource_files) \
        $(NULL)
 
 CLEANFILES += \
        config.js \
        polari \
+       $(resource_DATA) \
        $(NULL)
diff --git a/data/polari.gresource.xml b/src/polari.gresource.xml
similarity index 100%
rename from data/polari.gresource.xml
rename to src/polari.gresource.xml
diff --git a/data/resources/app-menu.ui b/src/resources/app-menu.ui
similarity index 100%
rename from data/resources/app-menu.ui
rename to src/resources/app-menu.ui
diff --git a/data/resources/application.css b/src/resources/application.css
similarity index 100%
rename from data/resources/application.css
rename to src/resources/application.css
diff --git a/data/resources/connection-details-dialog.ui b/src/resources/connection-details-dialog.ui
similarity index 100%
rename from data/resources/connection-details-dialog.ui
rename to src/resources/connection-details-dialog.ui
diff --git a/data/resources/connection-list-dialog.ui b/src/resources/connection-list-dialog.ui
similarity index 100%
rename from data/resources/connection-list-dialog.ui
rename to src/resources/connection-list-dialog.ui
diff --git a/data/resources/join-room-dialog.ui b/src/resources/join-room-dialog.ui
similarity index 100%
rename from data/resources/join-room-dialog.ui
rename to src/resources/join-room-dialog.ui
diff --git a/data/resources/main-window.ui b/src/resources/main-window.ui
similarity index 100%
rename from data/resources/main-window.ui
rename to src/resources/main-window.ui
diff --git a/data/resources/message-user-dialog.ui b/src/resources/message-user-dialog.ui
similarity index 100%
rename from data/resources/message-user-dialog.ui
rename to src/resources/message-user-dialog.ui