From: VMware, Inc <>
Date: Tue, 29 Mar 2011 20:16:43 +0000 (-0700)
Subject: Fix Open VM Tools build.
X-Git-Tag: 2011.03.28-387002~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3821e6aaa4b0af16d3a36d4e036c1575da8c5bc;p=thirdparty%2Fopen-vm-tools.git

Fix Open VM Tools build.

Forgot to incorporate recent GLib signals change (CLN 1338989) into
Open VM Tools build.  (,_,)

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

diff --git a/open-vm-tools/services/plugins/desktopEvents/Makefile.am b/open-vm-tools/services/plugins/desktopEvents/Makefile.am
index 85d1673ad..156c39f46 100644
--- a/open-vm-tools/services/plugins/desktopEvents/Makefile.am
+++ b/open-vm-tools/services/plugins/desktopEvents/Makefile.am
@@ -39,4 +39,24 @@ libdesktopEvents_la_SOURCES += xioError.c
 if HAVE_XSM
 libdesktopEvents_la_LIBADD += @XSM_LIBS@
 libdesktopEvents_la_SOURCES += sessionMgr.c
+libdesktopEvents_la_SOURCES += sessionMgrSignals.c
+
+BUILT_SOURCES =
+BUILT_SOURCES += sessionMgrSignals.c
+BUILT_SOURCES += sessionMgrSignals.h
+
+CLEANFILES =
+CLEANFILES += sessionMgrSignals.c
+CLEANFILES += sessionMgrSignals.h
+
+EXTRA_DIST =
+EXTRA_DIST += sessionMgrSignals.gm
+
+sessionMgrSignals.c: $(top_srcdir)/services/plugins/desktopEvents/sessionMgrSignals.gm
+	glib-genmarshal --body $(top_srcdir)/services/plugins/desktopEvents/sessionMgrSignals.gm > \
+	   $@ || (rm -f $@ && exit 1)
+
+sessionMgrSignals.h: $(top_srcdir)/services/plugins/desktopEvents/sessionMgrSignals.gm
+	glib-genmarshal --header $(top_srcdir)/services/plugins/desktopEvents/sessionMgrSignals.gm > \
+	   $@ || (rm -f $@ && exit 1)
 endif
diff --git a/open-vm-tools/services/plugins/desktopEvents/sessionMgrSignals.gm b/open-vm-tools/services/plugins/desktopEvents/sessionMgrSignals.gm
new file mode 100644
index 000000000..ddddaaa8b
--- /dev/null
+++ b/open-vm-tools/services/plugins/desktopEvents/sessionMgrSignals.gm
@@ -0,0 +1,29 @@
+##########################################################
+# Copyright (C) 2011 VMware, Inc. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation version 2.1 and no later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
+#
+##########################################################
+
+##
+# @file sessionMgrSignals.gm
+#
+# Defines the custom GClosure marshal functions for the desktopEvents::sessionMgr
+# signals.
+#
+# @see desktopEvents.h
+#
+
+# XSM SaveYourself signal.
+VOID:POINTER,INT,BOOLEAN,INT,BOOLEAN