From: Oliver Kurth Date: Wed, 7 Feb 2018 00:32:38 +0000 (-0800) Subject: Switch IMC to use RpcChannel_SendOne instead of deprecated RpcOut_sendOne X-Git-Tag: stable-10.3.0~157 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2321ff31fa671658ad0af3af22eef27e5d9af050;p=thirdparty%2Fopen-vm-tools.git Switch IMC to use RpcChannel_SendOne instead of deprecated RpcOut_sendOne Modify ./libDeployPkg/Makefile.am to build deploypkg module for open-vm-tools correctlly. --- diff --git a/open-vm-tools/libDeployPkg/Makefile.am b/open-vm-tools/libDeployPkg/Makefile.am index 9af3a52ba..b4d5c9d0c 100644 --- a/open-vm-tools/libDeployPkg/Makefile.am +++ b/open-vm-tools/libDeployPkg/Makefile.am @@ -1,5 +1,5 @@ ################################################################################ -### Copyright (C) 2014-2017 VMware, Inc. All rights reserved. +### Copyright (C) 2014-2018 VMware, Inc. All rights reserved. ### ### This program is free software; you can redistribute it and/or modify ### it under the terms of version 2 of the GNU General Public License as @@ -20,6 +20,8 @@ lib_LTLIBRARIES = libDeployPkg.la AM_CFLAGS = AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += $(MSPACK_CPPFLAGS) +AM_CFLAGS += -DVMTOOLS_USE_GLIB +AM_CFLAGS += @GLIB2_CPPFLAGS@ libDeployPkg_la_LIBADD = libDeployPkg_la_LIBADD += @MSPACK_LIBS@ @@ -48,7 +50,7 @@ libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/log.h libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/process.h libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-guest/guestcust-events.h libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vm_basic_types.h -libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/rpcout.h +libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/tools/guestrpc.h libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/deployPkg/linuxDeployment.h libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/deploypkg.h