[gnome-documents/wip/inigomartinez/meson: 1/3] build: Move libgd module to subprojects

[Iñigo Martínez <inigomartinez src gnome org>]

commit b274ea59ff422df4dc4b4f2ef774ec797c12821a
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Tue Aug 29 18:24:35 2017 +0200

    build: Move libgd module to subprojects
    
    In order to share the libgd module between autotools and meson,
    this patch moves its directory to subprojects directory and updates
    autotools.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787013

 .gitmodules                |    4 ++--
 Makefile.am                |    4 ++--
 configure.ac               |    4 ++--
 data/Makefile.am           |    4 ++--
 src/Makefile-lib.am        |    4 ++--
 libgd => subprojects/libgd |    0
 6 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index bfd964e..e91a9d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "libgd"]
-       path = libgd
+[submodule "subprojects/libgd"]
+       path = subprojects/libgd
        url = git://git.gnome.org/libgd
diff --git a/Makefile.am b/Makefile.am
index a88470f..4c1a97c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I subprojects/libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = help libgd src data po
+SUBDIRS = help subprojects/libgd src data po
 if BUILD_DOCUMENTATION
 SUBDIRS += man
 endif
diff --git a/configure.ac b/configure.ac
index 64e9d98..8da29fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,7 @@ LIBGD_INIT([
   notification
   tagged-entry
   gir
-])
+][subprojects/libgd])
 
 AX_PROG_GJS
 AX_CHECK_GIRS_GJS([cairo], [1.0])
@@ -140,7 +140,7 @@ AC_PATH_PROG(DESKTOP_FILE_VALIDATE, desktop-file-validate)
 AC_CONFIG_FILES([
 Makefile
 help/Makefile
-libgd/Makefile
+subprojects/libgd/Makefile
 src/Makefile
 data/Makefile
 data/icons/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 6f14cc8..f4ef544 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -52,8 +52,8 @@ check-local: org.gnome.Documents.desktop org.gnome.Books.desktop
 
 gsettings_ENUM_NAMESPACE = org.gnome.Documents
 gsettings_ENUM_FILES = \
-    $(top_srcdir)/libgd/libgd/gd-main-view.h \
-    $(top_srcdir)/libgd/libgd/gd-main-view-generic.h
+    $(top_srcdir)/subprojects/libgd/libgd/gd-main-view.h \
+    $(top_srcdir)/subprojects/libgd/libgd/gd-main-view-generic.h
 
 gsettings_SCHEMAS = org.gnome.documents.gschema.xml org.gnome.books.gschema.xml
 .PRECIOUS: $(gsettings_SCHEMAS)
diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
index 33c14d5..f858a95 100644
--- a/src/Makefile-lib.am
+++ b/src/Makefile-lib.am
@@ -1,6 +1,6 @@
 gdprivate_cflags = \
     -I$(top_srcdir)/src \
-    -I$(top_srcdir)/libgd \
+    -I$(top_srcdir)/subprojects/libgd \
     -DPREFIX=\"$(prefix)\" \
     -DLIBDIR=\"$(libdir)\" \
     -DG_LOG_DOMAIN=\"Gdprivate\" \
@@ -38,7 +38,7 @@ pkglib_LTLIBRARIES += libgdprivate-1.0.la
 libgdprivate_1_0_la_LIBADD = \
     $(DOCUMENTS_LIBS) \
     $(LIBM) \
-    $(top_builddir)/libgd/libgd.la
+    $(top_builddir)/subprojects/libgd/libgd.la
 
 
 libgdprivate_1_0_la_LDFLAGS = \
diff --git a/libgd b/subprojects/libgd
similarity index 100%
rename from libgd
rename to subprojects/libgd