Skip to content

Commit

Permalink
Fix distcheck. move gnome-sudoku.gresource.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
yaneti committed Aug 13, 2015
1 parent 92b0678 commit 8f0a31f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
1 change: 0 additions & 1 deletion configure.ac
Expand Up @@ -82,6 +82,5 @@ data/icons/hicolor/Makefile
lib/Makefile
help/Makefile
src/Makefile
src/gnome-sudoku.gresource.xml
])
AC_OUTPUT
1 change: 1 addition & 0 deletions data/Makefile.am
Expand Up @@ -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 \
Expand Down
11 changes: 11 additions & 0 deletions 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>
10 changes: 5 additions & 5 deletions src/Makefile.am
Expand Up @@ -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 = \
Expand All @@ -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
11 changes: 0 additions & 11 deletions src/gnome-sudoku.gresource.xml.in

This file was deleted.

0 comments on commit 8f0a31f

Please sign in to comment.