[gnumeric] embedder: Minor improvements targeting goffice

[Morten Welinder <mortenw src gnome org>]

commit 78a041d0499688f5a9374d3f0b3d73a7b73f1665
Author: Morten Welinder <terra gnome org>
Date:   Wed Nov 30 16:10:33 2011 -0500

    embedder: Minor improvements targeting goffice

 src/dialogs/Makefile.am |    1 +
 tools/ChangeLog         |    4 ++++
 tools/embedder          |    9 +++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am
index 8d8a36b..4db18d1 100644
--- a/src/dialogs/Makefile.am
+++ b/src/dialogs/Makefile.am
@@ -185,6 +185,7 @@ BUILT_SOURCES = embedded-ui.c
 embedded-ui.c: $(top_srcdir)/tools/embedder $(embedded_uis)
 	cd $(srcdir) && @PERL@ $(abs_top_srcdir)/tools/embedder \
 		--register-function=gnm_register_ui_files \
+		--register-file-function=gnm_rsm_register_file \
 		--include embedded-ui.h \
 		COMPRESS $(embedded_uis) >$(abs_builddir)/$@
 
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 02f5ab2..f09e7d2 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-30  Morten Welinder  <terra gnome org>
+
+	* embedder: Minor improvements targeting goffice.
+
 2011-11-27  Morten Welinder <terra gnome org>
 
 	* Release 1.11.1
diff --git a/tools/embedder b/tools/embedder
index 23c22d4..4c033fa 100644
--- a/tools/embedder
+++ b/tools/embedder
@@ -9,11 +9,15 @@ $myself =~ s|^.*/||;
 
 my $WIDTH = 70;
 my $regfunc = undef;
+my $regfuncstatic = 0;
+my $regfilefunc = undef;
 my @includes;
 
 &GetOptions("register-function=s" => \$regfunc,
+	    "register-file-function=s" => \$regfilefunc,
+	    "static" => \$regfuncstatic,
 	    "include=s" => \ includes,
-    );
+    ) or die "$0: invalid usage -- inquire within\n";
 
 # -----------------------------------------------------------------------------
 
@@ -27,6 +31,7 @@ foreach (@includes) {
 my $fileno = 0;
 my $reg = "";
 my $docompress = 0;
+print "static " if $regfuncstatic;
 print "void\n";
 print "$regfunc (void)\n";
 print "{\n";
@@ -71,7 +76,7 @@ sub embed {
     &embed_data ($data, $id);
 
     my $len = length ($data);
-    $reg .= "  gnm_rsm_register_file (\"$file\", $id, $len);\n";
+    $reg .= "  $regfilefunc (\"$file\", $id, $len);\n";
 }
 
 sub embed_data {