[gnome-flashback] sound-applet: move gvc submodule to new location

[Alberts Muktupāvels <muktupavels src gnome org>]

commit de7fec8451e34ee818533e40ebbd830a60cff09f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Dec 25 17:34:53 2019 +0200

    sound-applet: move gvc submodule to new location

 .gitmodules                                  |  2 +-
 Makefile.am                                  |  1 +
 configure.ac                                 |  4 +++-
 gnome-flashback/libsound-applet/Makefile.am  | 10 ++--------
 gvc/Makefile.am                              |  7 +++++++
 {gnome-flashback/libsound-applet => gvc}/gvc |  0
 po/POTFILES.in                               |  2 +-
 7 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index a413a39..11dd619 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gnome-flashback/libsound-applet/gvc"]
-       path = gnome-flashback/libsound-applet/gvc
+       path = gvc/gvc
        url = https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
diff --git a/Makefile.am b/Makefile.am
index 2492290..8d1606a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
        data \
        dbus \
        backends \
+       gvc \
        gnome-flashback \
        system-indicators \
        po \
diff --git a/configure.ac b/configure.ac
index 6b39c67..b2bcfb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,9 +413,11 @@ AC_CONFIG_FILES([
   gnome-flashback/libscreenshot/Makefile
   gnome-flashback/libshell/Makefile
   gnome-flashback/libsound-applet/Makefile
-  gnome-flashback/libsound-applet/gvc/Makefile
   gnome-flashback/libstatus-notifier-watcher/Makefile
 
+  gvc/Makefile
+  gvc/gvc/Makefile
+
   system-indicators/Makefile
 
   po/Makefile.in
diff --git a/gnome-flashback/libsound-applet/Makefile.am b/gnome-flashback/libsound-applet/Makefile.am
index aafd991..7bff965 100644
--- a/gnome-flashback/libsound-applet/Makefile.am
+++ b/gnome-flashback/libsound-applet/Makefile.am
@@ -1,9 +1,5 @@
 NULL =
 
-SUBDIRS = \
-       gvc \
-       $(NULL)
-
 noinst_LTLIBRARIES = \
        libsound-applet.la \
        $(NULL)
@@ -11,9 +7,7 @@ noinst_LTLIBRARIES = \
 libsound_applet_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"sound-applet\" \
        -DG_LOG_USE_STRUCTURED=1 \
-       -I$(top_builddir)/gnome-flashback/libsound-applet \
-       -I$(top_srcdir) \
-       -I$(srcdir)/gvc \
+       -I$(top_srcdir)/gvc/gvc \
        $(NULL)
 
 libsound_applet_la_CFLAGS = \
@@ -37,7 +31,7 @@ libsound_applet_la_LDFLAGS = \
        $(NULL)
 
 libsound_applet_la_LIBADD = \
-       $(top_builddir)/gnome-flashback/libsound-applet/gvc/libgvc.la \
+       $(top_builddir)/gvc/gvc/libgvc.la \
        $(SOUND_APPLET_LIBS) \
        $(LIBM) \
        $(NULL)
diff --git a/gvc/Makefile.am b/gvc/Makefile.am
new file mode 100644
index 0000000..374c714
--- /dev/null
+++ b/gvc/Makefile.am
@@ -0,0 +1,7 @@
+NULL =
+
+SUBDIRS = \
+       gvc \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/libsound-applet/gvc b/gvc/gvc
similarity index 100%
rename from gnome-flashback/libsound-applet/gvc
rename to gvc/gvc
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9265cda..4a706bb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,8 +40,8 @@ gnome-flashback/libpolkit/flashback-polkit-dialog.ui
 gnome-flashback/libscreensaver/gf-auth.c
 gnome-flashback/libsound-applet/gf-sound-applet.c
 gnome-flashback/libsound-applet/gvc-channel-bar.c
-gnome-flashback/libsound-applet/gvc/gvc-mixer-control.c
 gnome-flashback/libsound-applet/gvc-stream-status-icon.c
+gvc/gvc/gvc-mixer-control.c
 system-indicators/si-bluetooth.c
 system-indicators/si-input-source.c
 system-indicators/si-module.c