[dia: 16/105] #19: Move data/*.xml files to data/ui/.

[Zander <zbrown src gnome org>]

commit 89022dbff3742aa0c2f05f56390d0161c4fb912c
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Tue Dec 18 21:16:37 2018 +0000

    #19: Move data/*.xml files to data/ui/.
    
      - This is in-line with their installation location ($pkgdatadir/ui)

 configure.ac                           |  4 +---
 data/Makefile.am                       | 19 ++-----------------
 data/ui/Makefile.am                    | 15 +++++++++++++++
 data/{ => ui}/display-ui.xml           |  0
 data/{ => ui}/integrated-ui.xml        |  0
 data/{ => ui}/popup-ui.xml             |  0
 data/{ => ui}/sheets-edit-dialog.xml   |  0
 data/{ => ui}/sheets-main-dialog.xml   |  0
 data/{ => ui}/sheets-new-dialog.xml    |  0
 data/{ => ui}/sheets-remove-dialog.xml |  0
 data/{ => ui}/toolbar-ui.xml           |  0
 data/{ => ui}/toolbox-ui.xml           |  0
 12 files changed, 18 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c99fc3f2..e2c1142a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -429,9 +429,6 @@ CFLAGS="${CFLAGS} ${Z_CFLAGS}"
 LIBS="${LIBS} ${Z_LIBS}"
 
 
-dnl Path to UI resources
-AC_SUBST(uidatadir, '${pkgdatadir}/ui')
-
 dnl Platform-specific fixes.
 dnl
 
@@ -686,6 +683,7 @@ plug-ins/xslt/Makefile
 tests/Makefile
 tests/exports/Makefile
 data/Makefile
+data/ui/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/16x16/apps/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 0ca26d2a..df2fa0a2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,21 +1,6 @@
 
-SUBDIRS = icons
+SUBDIRS = icons ui
 
 pkgdata_DATA = dia-splash.png
 
-uidir = $(uidatadir)
-ui_DATA =                      \
-       display-ui.xml  \
-       toolbox-ui.xml  \
-       popup-ui.xml \
-       toolbar-ui.xml \
-       integrated-ui.xml \
-       \
-       sheets-edit-dialog.xml \
-       sheets-main-dialog.xml \
-       sheets-new-dialog.xml \
-       sheets-remove-dialog.xml
-
-EXTRA_DIST = \
-       $(ui_DATA) \
-       $(pkgdata_DATA)
+EXTRA_DIST = $(pkgdata_DATA)
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
new file mode 100644
index 00000000..27c7306d
--- /dev/null
+++ b/data/ui/Makefile.am
@@ -0,0 +1,15 @@
+uidir = $(pkgdatadir)/ui
+
+ui_DATA = \
+       display-ui.xml \
+       toolbox-ui.xml \
+       popup-ui.xml \
+       toolbar-ui.xml \
+       integrated-ui.xml \
+       \
+       sheets-edit-dialog.xml \
+       sheets-main-dialog.xml \
+       sheets-new-dialog.xml \
+       sheets-remove-dialog.xml
+
+EXTRA_DIST = $(ui_DATA)
diff --git a/data/display-ui.xml b/data/ui/display-ui.xml
similarity index 100%
rename from data/display-ui.xml
rename to data/ui/display-ui.xml
diff --git a/data/integrated-ui.xml b/data/ui/integrated-ui.xml
similarity index 100%
rename from data/integrated-ui.xml
rename to data/ui/integrated-ui.xml
diff --git a/data/popup-ui.xml b/data/ui/popup-ui.xml
similarity index 100%
rename from data/popup-ui.xml
rename to data/ui/popup-ui.xml
diff --git a/data/sheets-edit-dialog.xml b/data/ui/sheets-edit-dialog.xml
similarity index 100%
rename from data/sheets-edit-dialog.xml
rename to data/ui/sheets-edit-dialog.xml
diff --git a/data/sheets-main-dialog.xml b/data/ui/sheets-main-dialog.xml
similarity index 100%
rename from data/sheets-main-dialog.xml
rename to data/ui/sheets-main-dialog.xml
diff --git a/data/sheets-new-dialog.xml b/data/ui/sheets-new-dialog.xml
similarity index 100%
rename from data/sheets-new-dialog.xml
rename to data/ui/sheets-new-dialog.xml
diff --git a/data/sheets-remove-dialog.xml b/data/ui/sheets-remove-dialog.xml
similarity index 100%
rename from data/sheets-remove-dialog.xml
rename to data/ui/sheets-remove-dialog.xml
diff --git a/data/toolbar-ui.xml b/data/ui/toolbar-ui.xml
similarity index 100%
rename from data/toolbar-ui.xml
rename to data/ui/toolbar-ui.xml
diff --git a/data/toolbox-ui.xml b/data/ui/toolbox-ui.xml
similarity index 100%
rename from data/toolbox-ui.xml
rename to data/ui/toolbox-ui.xml