[gnome-font-viewer] toolbar: use libgd git submodule instead of copy-pasting

[Cosimo Cecchi <cosimoc src gnome org>]

commit 2b089bcd347e40757c6f305119cbd29a1bdf93ca
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Aug 22 14:13:23 2012 +0200

    toolbar: use libgd git submodule instead of copy-pasting
    
    Use the new libgd git submodule instead of manually importing the code
    from gnome-documents.

 .gitmodules           |    3 +
 Makefile.am           |    2 +-
 autogen.sh            |    1 +
 configure.ac          |    6 +
 libgd                 |    1 +
 src/Makefile.am       |    6 +-
 src/font-view.c       |    3 +-
 src/gd-main-toolbar.c |  293 -------------------------------------------------
 src/gd-main-toolbar.h |   86 --------------
 9 files changed, 17 insertions(+), 384 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..303eb9b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libgd"]
+	path = libgd
+	url = ../libgd
diff --git a/Makefile.am b/Makefile.am
index dd6709f..c282221 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = src po
+SUBDIRS = libgd src po
diff --git a/autogen.sh b/autogen.sh
index 79caedd..da7c93b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="GNOME Font Viewer"
+ACLOCAL_FLAGS="-I libgd"
 
 (test -f $srcdir/configure.ac \
   && test -f $srcdir/src/font-view.c) || {
diff --git a/configure.ac b/configure.ac
index eeb4bd0..d8b80e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,8 +50,14 @@ PKG_CHECK_MODULES(FONTVIEW,
                   glib-2.0 >= $GLIB_MIN_VERSION
                   gtk+-3.0 >= $GTK_MIN_VERSION)
 
+LIBGD_INIT([
+  main-toolbar
+  static
+])
+
 AC_CONFIG_FILES([
 Makefile
+libgd/Makefile
 src/Makefile
 src/gnome-font-viewer.desktop.in
 po/Makefile.in
diff --git a/libgd b/libgd
new file mode 160000
index 0000000..8d5897b
--- /dev/null
+++ b/libgd
@@ -0,0 +1 @@
+Subproject commit 8d5897beae054b0ad21ab638260d7f71c5b357a6
diff --git a/src/Makefile.am b/src/Makefile.am
index 15221c1..b23585c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 INCLUDES =					\
 	$(FONTVIEW_CFLAGS)			\
 	-DDIRECTORY_DIR=\"$(directorydir)\" 	\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
+	-I$(top_srcdir)/libgd
 
 bin_PROGRAMS = \
 	gnome-thumbnail-font \
@@ -37,6 +38,7 @@ gnome_thumbnail_font_SOURCES = \
 
 gnome_font_viewer_LDADD = \
 	-lm \
+	$(top_builddir)/libgd/libgd.la \
 	$(FONTVIEW_LIBS)
 
 gnome_font_viewer_SOURCES = \
@@ -46,8 +48,6 @@ gnome_font_viewer_SOURCES = \
 	font-model.c \
 	font-utils.h \
 	font-utils.c \
-	gd-main-toolbar.h \
-	gd-main-toolbar.c \
 	sushi-font-widget.h \
 	sushi-font-widget.c \
 	font-view.c
diff --git a/src/font-view.c b/src/font-view.c
index 0908c83..c439351 100644
--- a/src/font-view.c
+++ b/src/font-view.c
@@ -35,9 +35,10 @@
 #include <glib/gi18n.h>
 
 #include "font-model.h"
-#include "gd-main-toolbar.h"
 #include "sushi-font-widget.h"
 
+#include <libgd/gd-main-toolbar.h>
+
 #define FONT_VIEW_TYPE_APPLICATION font_view_application_get_type()
 #define FONT_VIEW_APPLICATION(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), FONT_VIEW_TYPE_APPLICATION, FontViewApplication))