[gnome-shell] Use libgnome-volume-control from a submodule

[Giovanni Campagna <gcampagna src gnome org>]

commit 3af9f636af23cd59c3d4ce00f3f4a0fdefd36386
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Fri Oct 19 19:02:41 2012 +0200

    Use libgnome-volume-control from a submodule
    
    To be shared with gnome-control-center and gnome-settings-daemon

 .gitmodules                         |    3 +
 autogen.sh                          |    8 +
 configure.ac                        |    1 +
 src/Makefile.am                     |    5 +-
 src/gvc                             |    1 +
 src/gvc/gvc-channel-map-private.h   |   39 -
 src/gvc/gvc-channel-map.c           |  252 ----
 src/gvc/gvc-channel-map.h           |   73 --
 src/gvc/gvc-mixer-card-private.h    |   35 -
 src/gvc/gvc-mixer-card.c            |  514 --------
 src/gvc/gvc-mixer-card.h            |   83 --
 src/gvc/gvc-mixer-control-private.h |   35 -
 src/gvc/gvc-mixer-control.c         | 2241 -----------------------------------
 src/gvc/gvc-mixer-control.h         |  108 --
 src/gvc/gvc-mixer-event-role.c      |  230 ----
 src/gvc/gvc-mixer-event-role.h      |   57 -
 src/gvc/gvc-mixer-sink-input.c      |  165 ---
 src/gvc/gvc-mixer-sink-input.h      |   57 -
 src/gvc/gvc-mixer-sink.c            |  199 ----
 src/gvc/gvc-mixer-sink.h            |   57 -
 src/gvc/gvc-mixer-source-output.c   |  120 --
 src/gvc/gvc-mixer-source-output.h   |   57 -
 src/gvc/gvc-mixer-source.c          |  199 ----
 src/gvc/gvc-mixer-source.h          |   57 -
 src/gvc/gvc-mixer-stream-private.h  |   34 -
 src/gvc/gvc-mixer-stream.c          |  964 ---------------
 src/gvc/gvc-mixer-stream.h          |  127 --
 src/gvc/gvc-pulseaudio-fake.h       |   34 -
 28 files changed, 16 insertions(+), 5739 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c830da0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/gvc"]
+	path = src/gvc
+	url = git://git.gnome.org/libgnome-volume-control
diff --git a/autogen.sh b/autogen.sh
index e963b9a..f9c9e6b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,6 +13,14 @@ PKG_NAME="gnome-shell"
     exit 1
 }
 
+# Fetch submodules if needed
+if test ! -f src/gvc/Makefile.am;
+then
+  echo "+ Setting up submodules"
+  git submodule init
+fi
+git submodule update
+
 which gnome-autogen.sh || {
     echo "You need to install gnome-common from GNOME Git (or from"
     echo "your OS vendor's package manager)."
diff --git a/configure.ac b/configure.ac
index 9d3bb3f..3ef10c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,6 +269,7 @@ AC_CONFIG_FILES([
   js/Makefile
   src/calendar-server/evolution-calendar.desktop.in
   src/Makefile
+  src/gvc/Makefile
   browser-plugin/Makefile
   tests/Makefile
   po/Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ddc8d6..0e035ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,8 @@ 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)
@@ -79,7 +81,6 @@ CLEANFILES += gnome-shell $(bin_SCRIPTS)
 
 include Makefile-st.am
 include Makefile-tray.am
-include Makefile-gvc.am
 include Makefile-calendar-server.am
 include Makefile-hotplug-sniffer.am
 
@@ -284,7 +285,7 @@ libgnome_shell_la_LIBADD =		\
 	$(BLUETOOTH_LIBS)	\
 	libst-1.0.la       	\
 	libtray.la		\
-	libgvc.la		\
+	gvc/libgvc.la		\
 	$(NULL)
 
 libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
diff --git a/src/gvc b/src/gvc
new file mode 160000
index 0000000..c1f42d5
--- /dev/null
+++ b/src/gvc
@@ -0,0 +1 @@
+Subproject commit c1f42d50e3998193b952eb3ba00fe737a263d601