From cfe060300ff10557f8805eee176604095c48cc2d Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Thu, 2 Feb 2012 14:04:27 +0100
Subject: clock: Convert to GResource

origin commits:
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=aa2895d
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=695d30c
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=00f9870
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=9ade365
---
 applets/clock/Makefile.am | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'applets/clock/Makefile.am')

diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 5d1c4bfc..3b390974 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -42,9 +42,6 @@ CLOCK_CPPFLAGS =						\
 	-I$(srcdir)/../../libmate-panel-applet			\
 	-I$(top_builddir)/libmate-panel-applet			\
 	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DBUILDERDIR=\""$(uidir)"\"				\
-	-DCLOCK_MENU_UI_DIR=\""$(xmluidir)"\"			\
-	-DICONDIR=\""$(datadir)/mate-panel/pixmaps"\"		\
 	-DMATEWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
 CLOCK_LDADD =						\
@@ -122,6 +119,8 @@ clock-typebuiltins.h: @REBUILD@ $(clock_enum_headers)
 BUILT_SOURCES =					\
 	clock-marshallers.c			\
 	clock-marshallers.h			\
+	clock-resources.c			\
+	clock-resources.h			\
 	clock-typebuiltins.c			\
 	clock-typebuiltins.h
 
@@ -149,11 +148,15 @@ org.mate.panel.applet.ClockAppletFactory.service: $(service_in_files)
 		$< > $@
 endif
 
-uidir		= $(datadir)/mate-panel/ui
-ui_DATA		= clock.ui
+ui_FILES =	\
+	clock.ui \
+	clock-menu.xml
 
-xmluidir 	= $(datadir)/mate-panel/ui
-xmlui_DATA	= clock-menu.xml
+clock-resources.c: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/clock.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $<
+
+clock-resources.h: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/clock.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name clock $<
 
 clock_gschemas_in = org.mate.panel.applet.clock.gschema.xml.in
 gsettings_SCHEMAS = $(clock_gschemas_in:.xml.in=.xml)
@@ -164,8 +167,8 @@ gsettings_SCHEMAS = $(clock_gschemas_in:.xml.in=.xml)
 EXTRA_DIST =						\
 	org.mate.panel.ClockApplet.mate-panel-applet.in.in	\
 	$(clock_gschemas_in)				\
-	$(xmlui_DATA)					\
-	$(ui_DATA)					\
+	$(ui_FILES)					\
+	clock.gresource.xml				\
 	clock-marshallers.list				\
 	$(service_in_files)
 
-- 
cgit v1.2.1