[gnome-calculator] Move resources into src directory.

[Robert Ancell <rancell src gnome org>]

commit 4b05da5f2e0bdf89a6e9460404de683749496742
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu May 25 11:40:25 2017 +1200

    Move resources into src directory.
    
    This is the more standard location and will make the Meson support easier to add.

 data/Makefile.am                             |   14 --------------
 po/POTFILES.in                               |   20 ++++++++++----------
 src/Makefile.am                              |   22 +++++++++++++++++++---
 {data => src}/buttons-advanced.ui            |    0
 {data => src}/buttons-basic.ui               |    0
 {data => src}/buttons-financial.ui           |    0
 {data => src}/buttons-programming.ui         |    0
 {data => src}/calculator.css                 |    0
 {data => src}/gnome-calculator.gresource.xml |    0
 {data => src}/history-entry.ui               |    0
 {data => src}/history-view.ui                |    0
 {data => src}/math-converter.ui              |    0
 {data => src}/math-function-popover.ui       |    0
 {data => src}/math-shortcuts.ui              |    0
 {data => src}/math-variable-popover.ui       |    0
 {data => src}/math-window.ui                 |    0
 {data => src}/menu.ui                        |    0
 17 files changed, 29 insertions(+), 27 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index d8cb99d..9ef6042 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,20 +14,6 @@ appdata_in_files = org.gnome.Calculator.appdata.xml.in
 man1_MANS = gnome-calculator.1 gcalccmd.1
 
 EXTRA_DIST = \
-       buttons-basic.ui \
-       buttons-advanced.ui \
-       buttons-financial.ui \
-       buttons-programming.ui \
-       history-entry.ui \
-       history-view.ui \
-       math-converter.ui \
-       math-function-popover.ui \
-       math-variable-popover.ui \
-       math-window.ui \
-       math-shortcuts.ui \
-       menu.ui \
-       calculator.css \
-       gnome-calculator.gresource.xml \
        $(appdata_in_files) \
        $(desktop_in_files) \
        $(gsettings_SCHEMAS) \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 86d52bf..0039fdf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,18 +1,18 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-[type: gettext/glade]data/buttons-advanced.ui
-[type: gettext/glade]data/buttons-basic.ui
-[type: gettext/glade]data/buttons-financial.ui
-[type: gettext/glade]data/buttons-programming.ui
+[type: gettext/glade]src/buttons-advanced.ui
+[type: gettext/glade]src/buttons-basic.ui
+[type: gettext/glade]src/buttons-financial.ui
+[type: gettext/glade]src/buttons-programming.ui
 data/org.gnome.Calculator.appdata.xml.in
 data/org.gnome.Calculator.desktop.in
-[type: gettext/glade]data/math-converter.ui
-[type: gettext/glade]data/math-function-popover.ui
-[type: gettext/glade]data/math-variable-popover.ui
-[type: gettext/glade]data/math-window.ui
-[type: gettext/glade]data/math-shortcuts.ui
-[type: gettext/glade]data/menu.ui
+[type: gettext/glade]src/math-converter.ui
+[type: gettext/glade]src/math-function-popover.ui
+[type: gettext/glade]src/math-variable-popover.ui
+[type: gettext/glade]src/math-window.ui
+[type: gettext/glade]src/math-shortcuts.ui
+[type: gettext/glade]src/menu.ui
 data/org.gnome.calculator.gschema.xml
 lib/currency.vala
 lib/equation-lexer.vala
diff --git a/src/Makefile.am b/src/Makefile.am
index dbe0871..16f6e94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,11 +9,11 @@ AM_CPPFLAGS = \
        $(LIBCALCULATOR_CFLAGS)
 
 
-resources_file = $(top_builddir)/data/gnome-calculator.gresource.xml
+resources_file = gnome-calculator.gresource.xml
 BUILT_SOURCES = resources.c
 
-resources.c: $(resources_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir=$(top_srcdir)/data/ $(top_srcdir)/data/gnome-calculator.gresource.xml)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data/ --generate-source $<
+resources.c: $(resources_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
--sourcedir=$(srcdir) $(srcdir)/gnome-calculator.gresource.xml)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
 gnome_calculator_SOURCES = \
        config.vapi \
@@ -68,4 +68,20 @@ gcalccmd_LDADD = \
        $(GCALCCMD_LIBS) \
        $(top_builddir)/lib/libcalculator.la
 
+EXTRA_DIST = \
+       buttons-basic.ui \
+       buttons-advanced.ui \
+       buttons-financial.ui \
+       buttons-programming.ui \
+       history-entry.ui \
+       history-view.ui \
+       math-converter.ui \
+       math-function-popover.ui \
+       math-variable-popover.ui \
+       math-window.ui \
+       math-shortcuts.ui \
+       menu.ui \
+       calculator.css \
+       gnome-calculator.gresource.xml
+
 -include $(top_srcdir)/git.mk
diff --git a/data/buttons-advanced.ui b/src/buttons-advanced.ui
similarity index 100%
rename from data/buttons-advanced.ui
rename to src/buttons-advanced.ui
diff --git a/data/buttons-basic.ui b/src/buttons-basic.ui
similarity index 100%
rename from data/buttons-basic.ui
rename to src/buttons-basic.ui
diff --git a/data/buttons-financial.ui b/src/buttons-financial.ui
similarity index 100%
rename from data/buttons-financial.ui
rename to src/buttons-financial.ui
diff --git a/data/buttons-programming.ui b/src/buttons-programming.ui
similarity index 100%
rename from data/buttons-programming.ui
rename to src/buttons-programming.ui
diff --git a/data/calculator.css b/src/calculator.css
similarity index 100%
rename from data/calculator.css
rename to src/calculator.css
diff --git a/data/gnome-calculator.gresource.xml b/src/gnome-calculator.gresource.xml
similarity index 100%
rename from data/gnome-calculator.gresource.xml
rename to src/gnome-calculator.gresource.xml
diff --git a/data/history-entry.ui b/src/history-entry.ui
similarity index 100%
rename from data/history-entry.ui
rename to src/history-entry.ui
diff --git a/data/history-view.ui b/src/history-view.ui
similarity index 100%
rename from data/history-view.ui
rename to src/history-view.ui
diff --git a/data/math-converter.ui b/src/math-converter.ui
similarity index 100%
rename from data/math-converter.ui
rename to src/math-converter.ui
diff --git a/data/math-function-popover.ui b/src/math-function-popover.ui
similarity index 100%
rename from data/math-function-popover.ui
rename to src/math-function-popover.ui
diff --git a/data/math-shortcuts.ui b/src/math-shortcuts.ui
similarity index 100%
rename from data/math-shortcuts.ui
rename to src/math-shortcuts.ui
diff --git a/data/math-variable-popover.ui b/src/math-variable-popover.ui
similarity index 100%
rename from data/math-variable-popover.ui
rename to src/math-variable-popover.ui
diff --git a/data/math-window.ui b/src/math-window.ui
similarity index 100%
rename from data/math-window.ui
rename to src/math-window.ui
diff --git a/data/menu.ui b/src/menu.ui
similarity index 100%
rename from data/menu.ui
rename to src/menu.ui