[gnome-power-manager] trivial: Move the UI file to src/ so we can regen the resources file if it changes
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] trivial: Move the UI file to src/ so we can regen the resources file if it changes
- Date: Tue, 5 Nov 2013 09:24:10 +0000 (UTC)
commit b60f72b49c0709af1c95285e3b47a893f3ea0ef2
Author: Richard Hughes <richard hughsie com>
Date: Tue Nov 5 09:23:59 2013 +0000
trivial: Move the UI file to src/ so we can regen the resources file if it changes
data/Makefile.am | 6 +-----
po/POTFILES.in | 2 +-
src/Makefile.am | 7 ++++---
{data => src}/gpm-statistics.ui | 0
4 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index b1628fa..66a6b58 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,13 +8,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@GSETTINGS_RULES@
gsettings_SCHEMAS = org.gnome.power-manager.gschema.xml
-UI_FILES = \
- gpm-statistics.ui
-
EXTRA_DIST = \
$(gsettings_SCHEMAS) \
- $(desktop_in_files) \
- $(UI_FILES)
+ $(desktop_in_files)
clean-local :
rm -f *~
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 06eb6a4..bd40aed 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,6 @@
data/org.gnome.power-manager.gschema.xml
data/appdata/gnome-power-statistics.appdata.xml.in
data/gnome-power-statistics.desktop.in.in
-[type: gettext/glade]data/gpm-statistics.ui
+[type: gettext/glade]src/gpm-statistics.ui
src/gpm-graph-widget.c
src/gpm-statistics.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e85af9..1b84d0f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,9 +67,9 @@ gnome_power_self_test_LDADD = \
gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS)
-gpm-resources.c: gnome-power-manager.gresource.xml ../data/gpm-statistics.ui
+gpm-resources.c: gnome-power-manager.gresource.xml gpm-statistics.ui
glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --c-name gpm
$(srcdir)/gnome-power-manager.gresource.xml
-gpm-resources.h: gnome-power-manager.gresource.xml
+gpm-resources.h: gnome-power-manager.gresource.xml gpm-statistics.ui
glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-header --c-name gpm
$(srcdir)/gnome-power-manager.gresource.xml
BUILT_SOURCES = \
@@ -78,7 +78,8 @@ BUILT_SOURCES = \
$(NULL)
EXTRA_DIST = \
- gnome-power-manager.gresource.xml
+ gnome-power-manager.gresource.xml \
+ gpm-statistics.ui
clean-local:
rm -f *~
diff --git a/data/gpm-statistics.ui b/src/gpm-statistics.ui
similarity index 100%
rename from data/gpm-statistics.ui
rename to src/gpm-statistics.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]