From: VMware, Inc <>
Date: Wed, 20 Jul 2011 20:40:22 +0000 (-0700)
Subject: open-vm-tools: only build the glib version of the rpcin library.
X-Git-Tag: 2011.07.19-450511~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=964fa80bfdc6ce9933406f7ae26f36eee3e0af98;p=thirdparty%2Fopen-vm-tools.git

open-vm-tools: only build the glib version of the rpcin library.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/rpcIn/Makefile.am b/open-vm-tools/lib/rpcIn/Makefile.am
index 6f8077d01..c18e0ef54 100644
--- a/open-vm-tools/lib/rpcIn/Makefile.am
+++ b/open-vm-tools/lib/rpcIn/Makefile.am
@@ -19,3 +19,7 @@ noinst_LTLIBRARIES = libRpcIn.la
 
 libRpcIn_la_SOURCES =
 libRpcIn_la_SOURCES += rpcin.c
+
+libRpcIn_la_CPPFLAGS =
+libRpcIn_la_CPPFLAGS += @VMTOOLS_CPPFLAGS@
+
diff --git a/open-vm-tools/libvmtools/Makefile.am b/open-vm-tools/libvmtools/Makefile.am
index 68cdd7212..8b9e551ff 100644
--- a/open-vm-tools/libvmtools/Makefile.am
+++ b/open-vm-tools/libvmtools/Makefile.am
@@ -31,6 +31,7 @@ libvmtools_la_LIBADD += ../lib/netUtil/libNetUtil.la
 libvmtools_la_LIBADD += ../lib/panic/libPanic.la
 libvmtools_la_LIBADD += ../lib/procMgr/libProcMgr.la
 libvmtools_la_LIBADD += ../lib/rpcChannel/libRpcChannel.la
+libvmtools_la_LIBADD += ../lib/rpcIn/libRpcIn.la
 libvmtools_la_LIBADD += ../lib/rpcOut/libRpcOut.la
 libvmtools_la_LIBADD += ../lib/rpcVmx/libRpcVmx.la
 libvmtools_la_LIBADD += ../lib/string/libString.la
@@ -63,9 +64,6 @@ libvmtools_la_SOURCES += vmtoolsConfig.c
 libvmtools_la_SOURCES += vmtoolsLog.c
 libvmtools_la_SOURCES += vmxLogger.c
 
-# Recompile the rpcIn library with GLIB support.
-libvmtools_la_SOURCES += $(top_srcdir)/lib/rpcIn/rpcin.c
-
 # Recompile the stub for Log_* functions, but not Log() itself (see -DNO_LOG_STUB).
 libvmtools_la_SOURCES += $(top_srcdir)/lib/stubs/stub-log.c