[gnome-builder] gd: move gd-tagged-entry to contrib/gd/

[Christian Hergert <chergert src gnome org>]

commit bfcda4105b46a2b58a1bead3d407d1566e8798c3
Author: Christian Hergert <christian hergert me>
Date:   Wed Jun 10 01:09:17 2015 -0700

    gd: move gd-tagged-entry to contrib/gd/

 configure.ac                          |    2 ++
 contrib/Makefile.am                   |   11 ++++++++++-
 contrib/gd/Makefile.am                |   11 +++++++++++
 {src => contrib}/gd/gd-tagged-entry.c |    0
 {src => contrib}/gd/gd-tagged-entry.h |    0
 plugins/command-bar/Makefile.am       |    2 +-
 src/Makefile.am                       |    5 ++---
 7 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0ef9ff5..baaa33c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,6 +157,7 @@ PKG_CHECK_MODULES(BUILDER,  [gtk+-3.0 >= gtk_required_version
                             vte-2.91 >= vte_required_version])
 PKG_CHECK_MODULES(EGG,      [glib-2.0 >= glib_required_version
                              gtk+-3.0 >= gtk_required_version])
+PKG_CHECK_MODULES(GD,       [gtk+-3.0 >= gtk_required_version])
 PKG_CHECK_MODULES(LIBIDE,   [gio-2.0 >= glib_required_version
                              gio-unix-2.0 >= glib_required_version
                              gtksourceview-3.0 >= gtksourceview_required_version
@@ -369,6 +370,7 @@ AC_CONFIG_FILES([
 
        contrib/Makefile
        contrib/egg/Makefile
+       contrib/gd/Makefile
        contrib/gedit/Makefile
        contrib/libeditorconfig/Makefile
        contrib/nautilus/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 36d80aa..d01f238 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,12 @@
-SUBDIRS = search gedit nautilus libeditorconfig egg rg xml
+SUBDIRS = \
+       egg \
+       gd \
+       gedit \
+       libeditorconfig \
+       nautilus \
+       rg \
+       search \
+       xml \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/contrib/gd/Makefile.am b/contrib/gd/Makefile.am
new file mode 100644
index 0000000..591db9e
--- /dev/null
+++ b/contrib/gd/Makefile.am
@@ -0,0 +1,11 @@
+noinst_LTLIBRARIES = libgd.la
+
+libgd_la_SOURCES = \
+       gd-tagged-entry.c \
+       gd-tagged-entry.h \
+       $(NULL)
+
+libgd_la_CFLAGS = $(GD_CFLAGS)
+libgd_la_LIBADD = $(GD_LIBS)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/gd/gd-tagged-entry.c b/contrib/gd/gd-tagged-entry.c
similarity index 100%
rename from src/gd/gd-tagged-entry.c
rename to contrib/gd/gd-tagged-entry.c
diff --git a/src/gd/gd-tagged-entry.h b/contrib/gd/gd-tagged-entry.h
similarity index 100%
rename from src/gd/gd-tagged-entry.h
rename to contrib/gd/gd-tagged-entry.h
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index d120a2c..62c45e5 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -36,10 +36,10 @@ libcommand_bar_la_CFLAGS = \
        -I$(top_srcdir)/src/workbench \
        -I$(top_srcdir)/src/views \
        -I$(top_srcdir)/src/documents \
-       -I$(top_srcdir)/src/gd \
        -I$(top_srcdir)/src/editor \
        -I$(top_srcdir)/src/util \
        -I$(top_srcdir)/src \
+       -I$(top_srcdir)/contrib/gd \
        -I$(top_srcdir)/contrib/nautilus \
        $(BUILDER_CFLAGS) \
        $(DEBUG_CFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index bd5e238..5579f31 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,8 +43,6 @@ libgnome_builder_la_SOURCES = \
        editor/gb-editor-view-private.h \
        editor/gb-editor-view.c \
        editor/gb-editor-view.h \
-       gd/gd-tagged-entry.c \
-       gd/gd-tagged-entry.h \
        greeter/gb-greeter-pill-box.c \
        greeter/gb-greeter-pill-box.h \
        greeter/gb-greeter-project-row.c \
@@ -164,6 +162,7 @@ libgnome_builder_la_LIBADD = \
        $(OPTIMIZE_LDFLAGS) \
        $(top_builddir)/libide/libide-1.0.la \
        $(top_builddir)/contrib/egg/libegg.la \
+       $(top_builddir)/contrib/gd/libgd.la \
        $(top_builddir)/contrib/gedit/libgedit.la \
        $(top_builddir)/contrib/nautilus/libnautilus.la \
        $(top_builddir)/contrib/rg/librg.la \
@@ -182,7 +181,6 @@ libgnome_builder_la_CFLAGS = \
        -I$(srcdir)/dialogs \
        -I$(srcdir)/documents \
        -I$(srcdir)/editor \
-       -I$(srcdir)/gd \
        -I$(srcdir)/greeter \
        -I$(srcdir)/html \
        -I$(srcdir)/keybindings \
@@ -200,6 +198,7 @@ libgnome_builder_la_CFLAGS = \
        -I$(top_builddir)/libide \
        -I$(top_srcdir)/libide \
        -I$(top_srcdir)/contrib/egg \
+       -I$(top_srcdir)/contrib/gd \
        -I$(top_srcdir)/contrib/gedit \
        -I$(top_srcdir)/contrib/nautilus \
        -I$(top_srcdir)/contrib/rg \