Get rid of ghIntegrationStub.

The stub library is not needed anymore now that we can just choose
where to compile the respective plugin.

Also remove leftover unityStub sources and Makefile.am.

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

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index fa6a9cc22288559836cdc3ee8c98579eb9277767..3f9bc1fb4722ac52943586eba0e5b4f946383450 100644 (file)
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -1228,7 +1228,6 @@ AC_CONFIG_FILES([                      \
    lib/file/Makefile                   \
    lib/foundryMsg/Makefile             \
    lib/ghIntegration/Makefile          \
-   lib/ghIntegrationStub/Makefile      \
    lib/guestApp/Makefile               \
    lib/guestRpc/Makefile               \
    lib/hgfs/Makefile                   \

diff --git a/open-vm-tools/lib/Makefile.am b/open-vm-tools/lib/Makefile.am
index ad409cfe67c9ed4cfe4e8bc1eb4089185aef6300..98852c96b580052d5ab2d42687114d06b1923705 100644 (file)
--- a/open-vm-tools/lib/Makefile.am
+++ b/open-vm-tools/lib/Makefile.am
@@ -30,7 +30,6 @@ SUBDIRS += err
 SUBDIRS += eventManager
 SUBDIRS += file
 SUBDIRS += foundryMsg
-SUBDIRS += ghIntegrationStub
 SUBDIRS += guestApp
 SUBDIRS += hgfs
 SUBDIRS += hgfsBd

diff --git a/open-vm-tools/lib/ghIntegrationStub/Makefile.am b/open-vm-tools/lib/ghIntegrationStub/Makefile.am
deleted file mode 100644 (file)
index 8760060..0000000
--- a/open-vm-tools/lib/ghIntegrationStub/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-### Copyright 2008 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
-### published by the Free Software Foundation.
-###
-### 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
-### GNU General Public License for more details.
-###
-### You should have received a copy of the GNU 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
-################################################################################
-
-noinst_LTLIBRARIES = libGhIntegrationStub.la
-
-libGhIntegrationStub_la_SOURCES =
-libGhIntegrationStub_la_SOURCES += ghIntegrationStub.c
-

diff --git a/open-vm-tools/lib/ghIntegrationStub/ghIntegrationStub.c b/open-vm-tools/lib/ghIntegrationStub/ghIntegrationStub.c
deleted file mode 100644 (file)
index 57e60be..0000000
--- a/open-vm-tools/lib/ghIntegrationStub/ghIntegrationStub.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*********************************************************
- * Copyright (C) 2010 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.
- *
- *********************************************************/
-
-/*
- * ghIntegrationStub.c --
- *
- *    Guest host integration functions.
- */
-
-#include "vmware.h" 
-#include "ghIntegration.h"
-
-void
-GHI_Init(void *ctx)
-{
-}
-
-void
-GHI_Cleanup(void)
-{
-}
-
-void
-GHI_RegisterCaps(void)
-{
-}
-
-void
-GHI_UnregisterCaps(void)
-{
-}

diff --git a/open-vm-tools/lib/unityStub/Makefile.am b/open-vm-tools/lib/unityStub/Makefile.am
deleted file mode 100644 (file)
index 8705e48..0000000
--- a/open-vm-tools/lib/unityStub/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-### Copyright 2008 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
-### published by the Free Software Foundation.
-###
-### 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
-### GNU General Public License for more details.
-###
-### You should have received a copy of the GNU 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
-################################################################################
-
-noinst_LTLIBRARIES = libUnityStub.la
-
-libUnityStub_la_SOURCES =
-libUnityStub_la_SOURCES += unityStub.c
-
-AM_CFLAGS = @GTK_CPPFLAGS@
-

diff --git a/open-vm-tools/lib/unityStub/unityStub.c b/open-vm-tools/lib/unityStub/unityStub.c
deleted file mode 100644 (file)
index 41fdd84..0000000
--- a/open-vm-tools/lib/unityStub/unityStub.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*********************************************************
- * Copyright (C) 2006 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.
- *
- *********************************************************/
-
-/*
- * UnityStub.c --
- *
- *    Unity functions.
- */
-
-#include "rpcin.h"
-#include "guestApp.h"
-#include "unity.h"
-
-/*
- *-----------------------------------------------------------------------------
- *
- * Unity_Init  --
- *
- *     One time initialization stuff.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      None.
- *
- *-----------------------------------------------------------------------------
- */
-
-void
-Unity_Init(GuestApp_Dict *conf,
-           int *blockingWndList,
-           DesktopSwitchCallbackManager *desktopSwitchCallbackMgr)
-{
-}
-
-Bool
-Unity_IsSupported(void)
-{
-   return FALSE;
-}
-
-void
-Unity_SetActiveDnDDetWnd(UnityDnD *state)
-{
-}
-
-void
-Unity_Exit(void)
-{
-}
-
-void
-Unity_Cleanup(void)
-{
-}
-
-void
-Unity_RegisterCaps(void)
-{
-}
-
-void
-Unity_UnregisterCaps(void)
-{
-}