[goffice] plot_surface: embed icons into plugin.xml

[Morten Welinder <mortenw src gnome org>]

commit 51233cbcd272a00f1e4476d3731d99f276f92b80
Author: Morten Welinder <terra gnome org>
Date:   Tue Dec 6 15:20:12 2011 -0500

    plot_surface: embed icons into plugin.xml

 pixmaps/Makefile.am                           |    4 +---
 plugins/plot_surface/Makefile.am              |    9 +++++++++
 {pixmaps => plugins/plot_surface}/contour.xpm |    0
 plugins/plot_surface/plot-types.xml.in        |    4 ++--
 plugins/plot_surface/plugin.xml.in            |    7 +++++++
 {pixmaps => plugins/plot_surface}/surface.xpm |    0
 6 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index a4fad00..e115d65 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,10 +1,8 @@
 icondir = $(goffice_icondir)
 dist_icon_DATA = \
-	contour.xpm	\
 	dist.xpm	\
 	doughnut.xpm	\
 	pie.xpm		\
 	radar.xpm	\
 	polar.png	\
-	stock.xpm	\
-	surface.xpm
+	stock.xpm
diff --git a/plugins/plot_surface/Makefile.am b/plugins/plot_surface/Makefile.am
index 26d0865..8146d0a 100644
--- a/plugins/plot_surface/Makefile.am
+++ b/plugins/plot_surface/Makefile.am
@@ -28,6 +28,15 @@ surface_la_SOURCES += \
 	gog-xyz-surface-prefs.c
 endif
 
+plugin_resources = contour.xpm surface.xpm
+pofiles = $(wildcard $(top_srcdir)/po/*.po)
+
+plugin.xml: plugin.xml.in $(plugin_resources) $(pofiles) $(top_srcdir)/tools/embedder
+	LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $  tmp
+	cd $(srcdir) && @PERL@ $(abs_top_srcdir)/tools/resource-embedder \
+		$  tmp $@
+	rm -f $  tmp
+
 # Do not use the intl-tool stuff to merge the text back;
 # it's simpler to just use gettext directly
 plot-types.xml : plot-types.xml.in
diff --git a/pixmaps/contour.xpm b/plugins/plot_surface/contour.xpm
similarity index 100%
rename from pixmaps/contour.xpm
rename to plugins/plot_surface/contour.xpm
diff --git a/plugins/plot_surface/plot-types.xml.in b/plugins/plot_surface/plot-types.xml.in
index 61170dc..f5f1205 100644
--- a/plugins/plot_surface/plot-types.xml.in
+++ b/plugins/plot_surface/plot-types.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Types xmlns:graph="http://www.gnumeric.org/graph_v2.dtd";>
-	<Family _name="Contour"	sample_image_file="contour.xpm" axis_set="pseudo-3d"/>
-	<Family _name="Surface"	sample_image_file="surface.xpm" axis_set="xyz"/>
+	<Family _name="Contour"	sample_image_file="res:go:plot_surface/contour.xpm" axis_set="pseudo-3d"/>
+	<Family _name="Surface"	sample_image_file="res:go:plot_surface/surface.xpm" axis_set="xyz"/>
 
 	<Type _name="Contour" row="1" col="1"
 		engine="GogContourPlot" family="Contour"
diff --git a/plugins/plot_surface/plugin.xml.in b/plugins/plot_surface/plugin.xml.in
index 9b4935c..2e6d5af 100644
--- a/plugins/plot_surface/plugin.xml.in
+++ b/plugins/plot_surface/plugin.xml.in
@@ -8,6 +8,13 @@
 		<attribute name="module_file" value="surface"/>
 	</loader>
 	<services>
+		<service type="resource"
+			 id="go:plot_surface/surface.xpm"
+			 file="surface.xpm"/>
+		<service type="resource"
+			 id="go:plot_surface/contour.xpm"
+			 file="surface.xpm"/>
+
 		<service type="plot_engine" id="GogContourPlot">
 			<information>
 				<_description>Contour plotting engine</_description>
diff --git a/pixmaps/surface.xpm b/plugins/plot_surface/surface.xpm
similarity index 100%
rename from pixmaps/surface.xpm
rename to plugins/plot_surface/surface.xpm