[bijiben/wip/inigomartinez/meson: 1/5] build: Move libgd module to subprojects

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

commit fb28bf95d7e53102c4e066d6210dc8666a496c61
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Tue Aug 15 20:12:56 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=782707

 .gitmodules                |    4 ++--
 Makefile.am                |    4 ++--
 configure.ac               |    5 +++--
 po/POTFILES.skip           |    2 +-
 src/Makefile.am            |    4 ++--
 src/libbiji/Makefile.am    |    2 +-
 subprojects/Makefile.am    |    3 +++
 libgd => subprojects/libgd |    0
 8 files changed, 14 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 e08ee6d..77a7532 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 = libgd src data po help
+SUBDIRS = subprojects/libgd src data po help
 
 bijibendoc = \
        README\
diff --git a/configure.ac b/configure.ac
index adbe95c..bd4157e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,11 +120,12 @@ LIBGD_INIT([
   main-view
   static
   tagged-entry
-])
+][subprojects/libgd])
 
 AC_CONFIG_FILES([
 Makefile
-libgd/Makefile
+subprojects/Makefile
+subprojects/libgd/Makefile
 data/Makefile
 data/org.gnome.bijiben.desktop.in
 data/icons/Makefile
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8e624b6..79919a3 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,4 @@
 data/org.gnome.bijiben.desktop.in
-libgd/libgd/gd-header-bar.c
+subprojects/libgd/libgd/gd-header-bar.c
 org.gnome.bijiben.desktop.in
 sub/data/org.gnome.bijiben.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 59516a6..d4ec0b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,13 +12,13 @@ AM_CPPFLAGS = \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-       -I$(top_srcdir)/libgd \
+       -I$(top_srcdir)/subprojects/libgd \
        -I$(top_builddir)/src/libbiji \
        $(BIJIBEN_CFLAGS)
 
 LDADD = libbiji/libbiji.la \
        $(LIBM) \
-       $(top_builddir)/libgd/libgd.la \
+       $(top_builddir)/subprojects/libgd/libgd.la \
        $(BIJIBEN_LIBS)
 
 bijiben_CFLAGS = \
diff --git a/src/libbiji/Makefile.am b/src/libbiji/Makefile.am
index 87c9522..8774c30 100644
--- a/src/libbiji/Makefile.am
+++ b/src/libbiji/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-       -I$(top_srcdir)/libgd \
+       -I$(top_srcdir)/subprojects/libgd \
        -I$(top_srcdir)/src/ \
        -I$(top_srcdir)/src/libbiji \
        $(BIJIBEN_CFLAGS) \
diff --git a/subprojects/Makefile.am b/subprojects/Makefile.am
new file mode 100644
index 0000000..563f375
--- /dev/null
+++ b/subprojects/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = libgd
+
+-include $(top_srcdir)/git.mk
diff --git a/libgd b/subprojects/libgd
similarity index 100%
rename from libgd
rename to subprojects/libgd