diff options
| author | Stefano Facchini <stefano.facchini@gmail.com> | 2014-07-08 22:12:26 +0200 |
|---|---|---|
| committer | Stefano Facchini <stefano.facchini@gmail.com> | 2014-07-08 22:21:31 +0200 |
| commit | f17e43f98e0a12d389df81fa09af49087aff4a76 (patch) | |
| tree | e7d39ff52d7a80b441b88f4d0bc821cb9af27f27 /src | |
| parent | 99298b2d032abc18bf6ccf45b59102bb8aa25264 (diff) | |
| download | baobab-f17e43f98e0a12d389df81fa09af49087aff4a76.tar.gz | |
Fix srcdir != builddir
This partially reverts commit 28b322ce4d583304d8ded89029440915a8176f08.
https://bugzilla.gnome.org/show_bug.cgi?id=732919
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/baobab-location-row.ui (renamed from src/resources/ui/baobab-location-row.ui) | 0 | ||||
| -rw-r--r-- | src/baobab-main-window.ui (renamed from src/resources/ui/baobab-main-window.ui) | 0 | ||||
| -rw-r--r-- | src/baobab.css (renamed from src/resources/baobab.css) | 0 | ||||
| -rw-r--r-- | src/baobab.gresource.xml | 13 | ||||
| -rw-r--r-- | src/menus.ui (renamed from src/resources/gtk/menus.ui) | 0 | ||||
| -rw-r--r-- | src/resources/baobab.gresource.xml | 9 |
7 files changed, 18 insertions, 14 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0b6aa8b..db0fcbb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ baobab_VALAFLAGS = \ --pkg gtk+-3.0 \ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ - --gresources=$(srcdir)/resources/baobab.gresource.xml \ + --gresources=baobab.gresource.xml \ $(NULL) VALA_SOURCES = \ @@ -37,9 +37,9 @@ baobab_SOURCES = \ $(BUILT_SOURCES) \ $(NULL) -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir)/resources $(srcdir)/resources/baobab.gresource.xml) -baobab-resources.c: $(srcdir)/resources/baobab.gresource.xml $(resource_files) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/resources --generate-source $< +resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/baobab.gresource.xml) +baobab-resources.c: baobab.gresource.xml $(resource_files) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< AM_CFLAGS = \ $(BAOBAB_CFLAGS) \ @@ -61,7 +61,7 @@ MAINTAINERCLEANFILES = \ $(NULL) EXTRA_DIST = \ - resources/baobab.gresource.xml \ + baobab.gresource.xml \ $(resource_files) \ $(NULL) diff --git a/src/resources/ui/baobab-location-row.ui b/src/baobab-location-row.ui index 4f18bf7..4f18bf7 100644 --- a/src/resources/ui/baobab-location-row.ui +++ b/src/baobab-location-row.ui diff --git a/src/resources/ui/baobab-main-window.ui b/src/baobab-main-window.ui index d3c71f6..d3c71f6 100644 --- a/src/resources/ui/baobab-main-window.ui +++ b/src/baobab-main-window.ui diff --git a/src/resources/baobab.css b/src/baobab.css index b2ee94c..b2ee94c 100644 --- a/src/resources/baobab.css +++ b/src/baobab.css diff --git a/src/baobab.gresource.xml b/src/baobab.gresource.xml new file mode 100644 index 0000000..b854dd9 --- /dev/null +++ b/src/baobab.gresource.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gresources> + <gresource prefix="/org/gnome/baobab/ui"> + <file compressed="true">baobab-location-row.ui</file> + <file compressed="true">baobab-main-window.ui</file> + </gresource> + <gresource prefix="/org/gnome/baobab/gtk"> + <file compressed="true">menus.ui</file> + </gresource> + <gresource prefix="/org/gnome/baobab"> + <file compressed="true">baobab.css</file> + </gresource> +</gresources> diff --git a/src/resources/gtk/menus.ui b/src/menus.ui index 1f9fe9b..1f9fe9b 100644 --- a/src/resources/gtk/menus.ui +++ b/src/menus.ui diff --git a/src/resources/baobab.gresource.xml b/src/resources/baobab.gresource.xml deleted file mode 100644 index 8455584..0000000 --- a/src/resources/baobab.gresource.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<gresources> - <gresource prefix="/org/gnome/baobab"> - <file compressed="true">ui/baobab-location-row.ui</file> - <file compressed="true">ui/baobab-main-window.ui</file> - <file compressed="true">gtk/menus.ui</file> - <file compressed="true">baobab.css</file> - </gresource> -</gresources> |