[iagno] Do not install files used via GResource.



commit e5aa145c35171641b059f04653644c63947de76c
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Tue Feb 10 04:49:26 2015 +0100

    Do not install files used via GResource.

 data/Makefile.am        |   10 ++--------
 src/iagno.gresource.xml |   10 +++++-----
 2 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 89b4f91..4e97078 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,8 @@
 SUBDIRS = icons
 
-uidir = $(datadir)/iagno
-ui_DATA = \
+dist_noinst_DATA = \
        iagno-menus.ui \
-       iagno.ui
-
-imagedir = $(datadir)/iagno/images
-image_DATA = \
+       iagno.ui \
        dark.svg \
        light.svg \
        mark.svg
@@ -37,8 +33,6 @@ gsettings_SCHEMAS = org.gnome.iagno.gschema.xml
 man_MANS = iagno.6
 
 EXTRA_DIST = \
-       $(ui_DATA) \
-       $(image_DATA) \
        $(theme_DATA) \
        $(sounds_DATA) \
        $(appstream_in_files) \
diff --git a/src/iagno.gresource.xml b/src/iagno.gresource.xml
index 46c3f8b..7a191ac 100644
--- a/src/iagno.gresource.xml
+++ b/src/iagno.gresource.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/iagno/images">
-    <file alias="dark.svg">../data/dark.svg</file>
-    <file alias="light.svg">../data/light.svg</file>
-    <file alias="mark.svg">../data/mark.svg</file>
+    <file preprocess="xml-stripblanks" alias="dark.svg">../data/dark.svg</file>
+    <file preprocess="xml-stripblanks" alias="light.svg">../data/light.svg</file>
+    <file preprocess="xml-stripblanks" alias="mark.svg">../data/mark.svg</file>
   </gresource>
   <gresource prefix="/org/gnome/iagno/ui">
-    <file alias="iagno.ui" preprocess="xml-stripblanks">../data/iagno.ui</file>
+    <file preprocess="xml-stripblanks" alias="iagno.ui">../data/iagno.ui</file>
   </gresource>
   <gresource prefix="/org/gnome/iagno/gtk">
-    <file alias="menus.ui" preprocess="xml-stripblanks">../data/iagno-menus.ui</file>
+    <file preprocess="xml-stripblanks" alias="menus.ui">../data/iagno-menus.ui</file>
   </gresource>
 </gresources>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]