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

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

commit 59035aea7957b52401dcd9822fc127b2456b94b3
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed Aug 30 17:20:20 2017 +0200

    build: Move libgd module to subprojects
    
    In order to ease the meson build port, this patch moves libgd module
    to subprojects directory.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787094

 .gitmodules                |    4 ++--
 Makefile.am                |    4 ++--
 configure.ac               |    4 ++--
 src/Makefile.am            |    4 ++--
 libgd => subprojects/libgd |    0
 5 files changed, 8 insertions(+), 8 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 6e77e6b..d1ba550 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 = . data libgd src po tests help
+SUBDIRS = . data subprojects/libgd src po tests help
 
 photosdocdir = $(docdir)
 photosdoc_DATA = \
diff --git a/configure.ac b/configure.ac
index ca84e53..855d0ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ LIBGD_INIT([
   main-icon-view
   static
   tagged-entry
-])
+][subprojects/libgd])
 
 AC_ARG_ENABLE(dogtail,
               [AS_HELP_STRING([--enable-dogtail],
@@ -155,7 +155,7 @@ data/Makefile
 data/org.gnome.Photos.desktop.in
 data/icons/Makefile
 help/Makefile
-libgd/Makefile
+subprojects/libgd/Makefile
 src/Makefile
 tests/Makefile
 po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bb7897..60968ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -409,7 +409,7 @@ AM_CPPFLAGS = \
        $(GTK_UNIX_PRINT_CFLAGS) \
        $(PNG_CFLAGS) \
        $(TRACKER_CFLAGS) \
-       -I$(top_srcdir)/libgd \
+       -I$(top_srcdir)/subprojects/libgd \
        $(NULL)
 
 AM_CFLAGS = \
@@ -440,7 +440,7 @@ gnome_photos_LDADD = \
        $(TRACKER_LIBS) \
        $(LIBM) \
        $(LIBRT) \
-       $(top_builddir)/libgd/libgd.la \
+       $(top_builddir)/subprojects/libgd/libgd.la \
        $(NULL)
 
 gnome_photos_thumbnailer_LDFLAGS = \
diff --git a/libgd b/subprojects/libgd
similarity index 100%
rename from libgd
rename to subprojects/libgd