[gnome-shell/wip/fmuellner/meson: 7/9] build: Move gvc submodule to /subprojects/gvc

[Florian Müllner <fmuellner src gnome org>]

commit 9f2f0d8ed0136871cb18194eb46e83eb5bb8da87
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu May 25 18:28:03 2017 +0200

    build: Move gvc submodule to /subprojects/gvc
    
    When using the meson build system, gvc will be built as a subproject.
    As meson restricts submodules to a subprojects/ directory in the
    source tree root, move the submodule there.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783229

 .gitmodules              |    6 +++---
 Makefile.am              |    2 +-
 autogen.sh               |    2 +-
 configure.ac             |    2 +-
 po/POTFILES.in           |    4 ++--
 src/Makefile.am          |    6 +++---
 {src => subprojects}/gvc |    0
 tests/run-test.sh.in     |    2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 7ee1d58..9546d8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "src/gvc"]
-       path = src/gvc
-       url = git://git.gnome.org/libgnome-volume-control
 [submodule "data/theme/gnome-shell-sass"]
        path = data/theme/gnome-shell-sass
        url = git://git.gnome.org/gnome-shell-sass
+[submodule "subprojects/gvc"]
+       path = subprojects/gvc
+       url = git://git.gnome.org/libgnome-volume-control
diff --git a/Makefile.am b/Makefile.am
index dba94ba..eba7d2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Point to our macro directory and pick up user flags from the environment
 ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = data js src  tests po docs
+SUBDIRS = data js subprojects/gvc src  tests po docs
 
 if BUILD_BROWSER_PLUGIN
 SUBDIRS += browser-plugin
diff --git a/autogen.sh b/autogen.sh
index a73a427..9794dc3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,7 +16,7 @@ cd "${srcdir}"
 }
 
 # Fetch submodules if needed
-if test ! -f src/gvc/Makefile.am || test ! -f data/theme/gnome-shell-sass/COPYING;
+if test ! -f subprojects/gvc/Makefile.am || test ! -f data/theme/gnome-shell-sass/COPYING;
 then
   echo "+ Setting up submodules"
   git submodule init
diff --git a/configure.ac b/configure.ac
index 969b647..50b584c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,7 +259,7 @@ AC_CONFIG_FILES([
   docs/reference/st/st-docs.sgml
   js/Makefile
   src/Makefile
-  src/gvc/Makefile
+  subprojects/gvc/Makefile
   browser-plugin/Makefile
   tests/Makefile
   po/Makefile.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 121c512..98b7c60 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -64,8 +64,6 @@ js/ui/windowAttentionHandler.js
 js/ui/windowManager.js
 js/ui/windowMenu.js
 src/calendar-server/evolution-calendar.desktop.in
-# Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get 
it.
-src/gvc/gvc-mixer-control.c
 src/main.c
 src/shell-app.c
 src/shell-app-system.c
@@ -73,3 +71,5 @@ src/shell-global.c
 src/shell-keyring-prompt.c
 src/shell-polkit-authentication-agent.c
 src/shell-util.c
+# Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get 
it.
+subprojects/gvc/gvc-mixer-control.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 656ce89..24628cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,8 +8,6 @@ noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 service_in_files =
 
-SUBDIRS = gvc
-
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) 
--add-include-path=$(MUTTER_GIR_DIR) -L$(MUTTER_TYPELIB_DIR)
@@ -287,6 +285,8 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in stamp-shell-enum-types.h
        rm -f $(@F).tmp
 EXTRA_DIST += shell-enum-types.c.in
 
+gvcdir = $(top_builddir)/subprojects/gvc
+
 libgnome_shell_ldflags = -avoid-version
 libgnome_shell_libadd =                \
        -lm                     \
@@ -294,7 +294,7 @@ libgnome_shell_libadd =             \
        libgnome-shell-menu.la  \
        libst-1.0.la            \
        libtray.la              \
-       gvc/libgvc.la           \
+       $(gvcdir)/libgvc.la     \
        $(NULL)
 
 libgnome_shell_menu_la_LDFLAGS = $(libgnome_shell_ldflags)
diff --git a/src/gvc b/subprojects/gvc
similarity index 100%
rename from src/gvc
rename to subprojects/gvc
diff --git a/tests/run-test.sh.in b/tests/run-test.sh.in
index f55d966..b7c0afc 100755
--- a/tests/run-test.sh.in
+++ b/tests/run-test.sh.in
@@ -30,7 +30,7 @@ builddir=`cd $builddir && pwd`
 srcdir=@srcdir@
 srcdir=`cd $srcdir && pwd`
 
-GI_TYPELIB_PATH="$GI_TYPELIB_PATH${GI_TYPELIB_PATH:+:}@MUTTER_TYPELIB_DIR@:$builddir/../src:$builddir/../src/gvc"
+GI_TYPELIB_PATH="$GI_TYPELIB_PATH${GI_TYPELIB_PATH:+:}@MUTTER_TYPELIB_DIR@:$builddir/../src:$top_builddir/subprojects/gvc"
 GJS_PATH="$srcdir:$srcdir/../js:$builddir/../js"
 GJS_DEBUG_OUTPUT=stderr
 $verbose || GJS_DEBUG_TOPICS="JS ERROR;JS LOG"