[gnome-sudoku] Fix distcheck. move gnome-sudoku.gresource.xml



commit 8f0a31f3a29703d072d7c2ba7aa93c974ca38344
Author: Yanko Kaneti <yaneti declera com>
Date:   Thu Aug 13 00:51:41 2015 +0300

    Fix distcheck. move gnome-sudoku.gresource.xml

 configure.ac                      |    1 -
 data/Makefile.am                  |    1 +
 data/gnome-sudoku.gresource.xml   |   11 +++++++++++
 src/Makefile.am                   |   10 +++++-----
 src/gnome-sudoku.gresource.xml.in |   11 -----------
 5 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f8b3295..583a0db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,5 @@ data/icons/hicolor/Makefile
 lib/Makefile
 help/Makefile
 src/Makefile
-src/gnome-sudoku.gresource.xml
 ])
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 0092f00..673721d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -17,6 +17,7 @@ pixmapdir = $(datadir)/gnome-sudoku/images/
 pixmap_DATA = footprints.png
 
 dist_noinst_DATA = \
+       gnome-sudoku.gresource.xml \
        gnome-sudoku.ui \
        gnome-sudoku-menu.ui \
        print-dialog.ui \
diff --git a/data/gnome-sudoku.gresource.xml b/data/gnome-sudoku.gresource.xml
new file mode 100644
index 0000000..f56f566
--- /dev/null
+++ b/data/gnome-sudoku.gresource.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/sudoku/ui">
+    <file alias="gnome-sudoku.css">gnome-sudoku.css</file>
+    <file preprocess="xml-stripblanks" alias="gnome-sudoku.ui">gnome-sudoku.ui</file>
+    <file preprocess="xml-stripblanks" alias="print-dialog.ui">print-dialog.ui</file>
+  </gresource>
+  <gresource prefix="/org/gnome/sudoku/gtk">
+    <file preprocess="xml-stripblanks" alias="menus.ui">gnome-sudoku-menu.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/Makefile.am b/src/Makefile.am
index 5fd71a8..711d833 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,7 @@ gnome_sudoku_CPPFLAGS = \
        -DLOCALEDIR=\"$(localedir)\" \
        -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
        -I$(top_srcdir)/lib \
+       -I$(top_builddir)/lib \
        $(GNOME_SUDOKU_CFLAGS)
 
 gnome_sudoku_LDADD = \
@@ -33,14 +34,13 @@ gnome_sudoku_VALAFLAGS = \
        --pkg gtk+-3.0 \
        --pkg gee-0.8 \
        --target-glib=$(GLIB_REQUIRED) \
-       --gresources=$(builddir)/gnome-sudoku.gresource.xml \
-       $(top_builddir)/lib/libsudoku.vapi
+       --gresources=$(abs_top_srcdir)/data/gnome-sudoku.gresource.xml \
+       $(abs_top_srcdir)/lib/libsudoku.vapi
 
-gnome-sudoku-resources.c: gnome-sudoku.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies gnome-sudoku.gresource.xml)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+gnome-sudoku-resources.c: $(top_srcdir)/data/gnome-sudoku.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) 
--sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/gnome-sudoku.gresource.xml)
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-source $<
 
 CLEANFILES = \
-       gnome-sudoku.gresource.xml \
        gnome-sudoku-resources.c
 
 -include $(top_srcdir)/git.mk


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