[gnome-settings-daemon/wip/inigomartinez/meson: 1/5] build: Move gvc module to subprojects

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

commit 64690c8fcf60a3a5fa1d9ccd85b54a75ec2f041f
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Jan 26 08:46:15 2018 +0100

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

 .gitmodules                             |    4 ++--
 Makefile.am                             |    1 +
 configure.ac                            |    2 +-
 plugins/media-keys/Makefile.am          |    6 +++---
 {plugins/media-keys => subprojects}/gvc |    0
 5 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index b193825..220db1e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "plugins/media-keys/gvc"]
-       path = plugins/media-keys/gvc
+[submodule "subprojects/gvc"]
+       path = subprojects/gvc
        url = git://git.gnome.org/libgnome-volume-control
diff --git a/Makefile.am b/Makefile.am
index 096c245..0e032d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 SUBDIRS =                      \
        gnome-settings-daemon   \
+       subprojects/gvc         \
        data                    \
        plugins                 \
        po                      \
diff --git a/configure.ac b/configure.ac
index d04f8b6..70db63c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -517,7 +517,6 @@ plugins/power/Makefile
 plugins/housekeeping/Makefile
 plugins/keyboard/Makefile
 plugins/media-keys/Makefile
-plugins/media-keys/gvc/Makefile
 plugins/mouse/Makefile
 plugins/print-notifications/Makefile
 plugins/rfkill/Makefile
@@ -527,6 +526,7 @@ plugins/smartcard/Makefile
 plugins/sound/Makefile
 plugins/wacom/Makefile
 plugins/xsettings/Makefile
+subprojects/gvc/Makefile
 data/Makefile
 data/gnome-settings-daemon.pc
 data/org.gnome.settings-daemon.plugins.gschema.xml.in
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 489b9d2..d278588 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -10,7 +10,7 @@ audio_selection_test_LDADD = $(MEDIA_KEYS_LIBS)
 
 NULL =
 
-SUBDIRS = gvc
+SUBDIRS =
 
 BUILT_SOURCES =                        \
        gsd-marshal.h                   \
@@ -62,7 +62,7 @@ gsd_media_keys_CPPFLAGS = \
        -I$(top_srcdir)/gnome-settings-daemon                   \
        -I$(top_builddir)/gnome-settings-daemon                 \
        -I$(top_srcdir)/plugins/common                          \
-       -I$(top_srcdir)/plugins/media-keys/gvc                  \
+       -I$(top_srcdir)/subprojects/gvc                         \
        -DBINDIR=\"$(bindir)\"                                  \
        -DPIXMAPDIR=\""$(pkgdatadir)"\"                         \
        -DGTKBUILDERDIR=\""$(pkgdatadir)"\"                     \
@@ -76,7 +76,7 @@ gsd_media_keys_CFLAGS =                       \
 gsd_media_keys_LDADD = \
        $(top_builddir)/gnome-settings-daemon/libgsd.la         \
        $(top_builddir)/plugins/common/libcommon.la             \
-       $(top_builddir)/plugins/media-keys/gvc/libgvc.la        \
+       $(top_builddir)/subprojects/gvc/libgvc.la               \
        $(MEDIA_KEYS_LIBS)                                      \
        $(LIBM)
 
diff --git a/plugins/media-keys/gvc b/subprojects/gvc
similarity index 100%
rename from plugins/media-keys/gvc
rename to subprojects/gvc