lbxgui: Compile in the glade UI description.

I don't think it makes any sense to try and jump through hoops to find
this data at runtime, given that the data and the code are so intimately
connected.

diff --git a/Makefile.am b/Makefile.am
index 78541b1d59b652d66a1ab25dc3d843ce9dc32546..b5f27b17dc8370047f8f4122129b6d004a484c49 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = m4/gnulib-cache.m4
+EXTRA_DIST  = m4/gnulib-cache.m4
+CLEANFILES  =
 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
 AM_LDFLAGS  = -L$(top_builddir)/lib

diff --git a/src/gui/.gitignore b/src/gui/.gitignore
new file mode 100644 (file)
index 0000000..7b5df61
--- /dev/null
+++ b/src/gui/.gitignore
@@ -0,0 +1 @@
+lbxgui_xml.c

diff --git a/src/gui/Makefile.inc b/src/gui/Makefile.inc
index d195d3580f179bca43eb629b9953982693d5f36d..ef14cf8c37a0b7ab5e33c985c82c0b44916715b3 100644 (file)
--- a/src/gui/Makefile.inc
+++ b/src/gui/Makefile.inc
@@ -6,11 +6,24 @@
 
 if BUILD_LBXGUI
 
+LBXGUI_GLADE    = $(top_srcdir)/src/gui/lbxgui.glade
+EXTRA_DIST     += $(LBXGUI_GLADE)
+CLEANFILES     += src/gui/lbxgui_xml.c
+
+noinst_HEADERS += src/gui/bg.xbm src/gui/render.h
+
+src/gui/lbxgui_xml.c: $(LBXGUI_GLADE)
+       $(AM_V_GEN) sed -e 's/"/\\"/g' \
+                       -e 's/.*/"&"/' \
+                       -e '1 s/^/char lbxgui_xml[] =\n/' \
+                       -e '$$ s/$$/;/' $(LBXGUI_GLADE) > $@
+
 bin_PROGRAMS += lbxgui
-lbxgui_SOURCES  = src/gui/render.c src/gui/lbxgui.c
-lbxgui_LDADD    = liblbx.la $(GTK_LIBS)
-lbxgui_CPPFLAGS = -I$(top_srcdir)/src
-lbxgui_CFLAGS   = $(GTK_CFLAGS)
-lbxgui_LDFLAGS  = $(AM_LDFLAGS) -export-dynamic
+nodist_lbxgui_SOURCES = src/gui/lbxgui_xml.c
+lbxgui_SOURCES        = src/gui/render.c src/gui/lbxgui.c
+lbxgui_LDADD          = liblbx.la $(GTK_LIBS)
+lbxgui_CPPFLAGS       = -I$(top_srcdir)/src
+lbxgui_CFLAGS         = $(GTK_CFLAGS)
+lbxgui_LDFLAGS        = $(AM_LDFLAGS) -export-dynamic
 
 endif

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 0cb929e829fc94efceb29a2f7e3efcebf18ea179..8321850eaefed2d2819960ba5a5cd816ee50b34c 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -29,6 +29,8 @@
 
 #include "bg.xbm"
 
+extern char lbxgui_xml[];
+
 static GtkTreeStore *archives;
 static GtkBuilder *builder;
 
@@ -480,7 +482,7 @@ int main(int argc, char **argv)
                load_archive(*argv++);
 
        builder = gtk_builder_new();
-       if (!gtk_builder_add_from_file(builder, "src/gui/lbxgui.glade", &err)) {
+       if (!gtk_builder_add_from_string(builder, lbxgui_xml, -1, &err)) {
                fprintf(stderr, "%s\n", err->message);
                return EXIT_FAILURE;
        }