From c9a36d684a771ffa32aa22b3cb257d6c693eebb8 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 10 Feb 2010 00:40:17 -0500
Subject: [PATCH] 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.
---
 Makefile.am          |  3 ++-
 src/gui/.gitignore   |  1 +
 src/gui/Makefile.inc | 23 ++++++++++++++++++-----
 src/gui/lbxgui.c     |  4 +++-
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 src/gui/.gitignore

diff --git a/Makefile.am b/Makefile.am
index 78541b1..b5f27b1 100644
--- 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
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 d195d35..ef14cf8 100644
--- 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 0cb929e..8321850 100644
--- 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;
 	}
-- 
2.43.0