use separated libosmo-mgcp-client, apply rename to mgcp_client_*

After osmo-mgw changes I8e0b2d2a399b77086a36606f5e427271c6242df1 and
I99f7faab637cfcc22ece64a1dbcbe590f2042187, apply linking of new
libosmo-mgcp-client and renames to drop the "gw" from mgcp_client_*.

Also rename the gsm_network.mgcpgw to mgw, to indicate that the MGCP client is
used to contact the MGW (Media Gateway).

Depends: I8e0b2d2a399b77086a36606f5e427271c6242df1 (osmo-mgw)
         I99f7faab637cfcc22ece64a1dbcbe590f2042187 (osmo-mgw)
Change-Id: I093ad02ca0e532f659447c785e09678b3e6f220d
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 9343c31..5d3d5ca 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -17,7 +17,7 @@
 #include <osmocom/msc/common.h>
 #include <osmocom/msc/rest_octets.h>
 #include <osmocom/msc/common_cs.h>
-#include <osmocom/legacy_mgcp/mgcpgw_client.h>
+#include <osmocom/mgcp_client/mgcp_client.h>
 
 
 /** annotations for msgb ownership */
@@ -486,9 +486,9 @@
 	uint8_t t3212;
 
 	struct {
-		struct mgcpgw_client_conf conf;
-		struct mgcpgw_client *client;
-	} mgcpgw;
+		struct mgcp_client_conf conf;
+		struct mgcp_client *client;
+	} mgw;
 
 	struct {
 		/* CS7 instance id number (set via VTY) */