[bijiben/wip/inigomartinez/meson: 2/3] build: Updated autotools to use libgd module at subprojects

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

commit fb343eb693cc168cbf9f225ff4c4ec450d695547
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Jun 12 18:46:06 2017 +0200

    build: Updated autotools to use libgd module at subprojects
    
    In order to share the libgd module between autotools and meson,
    autotools configuration has been updated.
    
    Meson version has also been raised to 0.40.1 that helps removing
    libgds wrap file, which is not needed anymore.

 .gitmodules             |    3 ---
 Makefile.am             |    4 ++--
 configure.ac            |    5 +++--
 libgd                   |    1 -
 meson.build             |    2 +-
 po/POTFILES.skip        |    2 +-
 src/Makefile.am         |    4 ++--
 src/libbiji/Makefile.am |    2 +-
 subprojects/Makefile.am |    3 +++
 subprojects/libgd.wrap  |    4 ----
 10 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index e4d4b5b..054b71c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "libgd"]
-       path = libgd
-       url = git://git.gnome.org/libgd
 [submodule "subprojects/libgd"]
        path = subprojects/libgd
        url = https://git.gnome.org/browse/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 4623c7a..7da11bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,11 +110,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/meson.build b/meson.build
index cff0268..c3e8964 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@ project(
     'c_std=gnu99',
     'warning_level=1'
   ],
-  meson_version: '>= 0.38.1'
+  meson_version: '>= 0.40.1'
 )
 
 bijiben_version = meson.project_version()
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 1c0c39e..f3a7af4 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