~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.raring-precise.backport

« back to all changes in this revision

Viewing changes to services/plugins/unity/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Nate Muench
  • Date: 2012-01-23 16:09:45 UTC
  • mfrom: (1.4.6) (2.4.26 sid)
  • Revision ID: package-import@ubuntu.com-20120123160945-b6s0r1vkcovucpf3
Tags: 2011.12.20-562307-0ubuntu1
* Merge latest upstream git tag. Fixes building on Precise
  (LP: #898289, LP: #905612)

* Items merged from Debian unstable:
  - debian/control:
    + open-vm-tools recommends open-vm-dkms. (LP: #598933)
    + open-vm-tools now suggests open-vm-toolbox. (LP: #604998)
  (From 2011.08.21-471295-1 release)
  - Updating maintainer and uploaders fields.
  - Removing vcs fields.
  - Removing references to Daniel's old email address.
  - Updating years in copyright file.
  - Updating to standards version 3.9.2.
  - Updating to debhelper version 8.
  - Switching to source format 3.0 (quilt).
  - Removing manual chrpath setting.
  - Removing exclusion from plugins from debhelper shlibs.
  - Rediffing kvers.patch.
  (From 2011.09.23-491607-1 release)
  - Marking binary architecture-dependend packages as linux and kfreebsd
  only.
  - Removing liburiparser-dev from build-depends as upstream dropped
  unity support.
  - Building with libproc-dev on amd64 again.
  - Dropping disabling of dnet support.
  (From 2011.09.23-491607-2 release)
  - Adding doxygen to build-depends for api documentation.
  - Adding libcunit1-dev to build-depends for test suites.
  - Minimizing rules file.
  - Adding open-vm-tools-dev package, containing only the api
    documentation for now.
  (From 2011.09.23-491607-3 release)
  - Sorting overrides in rules alphabetically.
  - Compacting copyright file.
  - Adding udev rule to set timeout for vmware scsi devices
  (From 2011.12.20-562307-1 release)
  - Adding patch to correct typo in upstreams dkms configuration

* Remaining Changes:
  - Remove Stable part of version numbering.
  - debian folder:
    + Re-added open-vm-dkms.postinst & open-vm-dkms.prerm.
      * Allows dkms modules to compile upon installation.
  - debian/control:
    + Re-add open-vm-source and make into a transitional package
      for open-vm-toolbox.
    + Return dependancies that were moved to open-vm-tools back to
      open-vm-toolbox.
  - debian/rules and debian/open-vm-toolbox.lintian-overrides:
    + Make vmware-user-suid-wrapper suid-root
  - debian/rules:
    + Added CFLAGS field with -Wno-deprecated-declarations
      * Will suppress issues with glib 2.31 or later.
    + Add line to copy vmware-xdg-detect-de into place.
    + Install vmware-user.desktop through toolbox package.
  - debian/open-vm-tools.init:
    + Re-add 'modprobe [-r] vmblock'.
    + Add 'modprobe [-r] vmxnet'.
      * Incase it's not loaded during boot.
    + Remove and re-add pcnet32 module
      * Will be done before (remove) and after (readd) vmxnet module
        is added.
      * If vmxnet doesn't exist (aka modules fail to build), pcnet32 can be
        still used for network connectivity.
      * Workaround until a better fix can be done.
  - Re-add gnome-session to debian/local/xautostart.conf
  - Manpages removed (from debian/manpages):
    + vmmemctl.9
    + vmxnet3.9
    + Remove references to manpages that have been removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
################################################################################
2
 
### Copyright 2010 VMware, Inc.  All rights reserved.
3
 
###
4
 
### This program is free software; you can redistribute it and/or modify
5
 
### it under the terms of version 2 of the GNU General Public License as
6
 
### published by the Free Software Foundation.
7
 
###
8
 
### This program is distributed in the hope that it will be useful,
9
 
### but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
### GNU General Public License for more details.
12
 
###
13
 
### You should have received a copy of the GNU General Public License
14
 
### along with this program; if not, write to the Free Software
15
 
### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
16
 
################################################################################
17
 
 
18
 
plugindir = @VMUSR_PLUGIN_INSTALLDIR@
19
 
plugin_LTLIBRARIES = libunity.la
20
 
 
21
 
CFLAGS += -Wno-unused
22
 
 
23
 
libunity_la_CPPFLAGS =
24
 
libunity_la_CPPFLAGS += @GTK_CPPFLAGS@
25
 
libunity_la_CPPFLAGS += @GTKMM_CPPFLAGS@
26
 
libunity_la_CPPFLAGS += @GIO_CPPFLAGS@
27
 
libunity_la_CPPFLAGS += @LIBPNG_CPPFLAGS@
28
 
libunity_la_CPPFLAGS += @URIPARSER_CPPFLAGS@
29
 
libunity_la_CPPFLAGS += @PLUGIN_CPPFLAGS@
30
 
libunity_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/unity/ghIntegration
31
 
libunity_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/unity/unitylib
32
 
libunity_la_CPPFLAGS += -I$(top_srcdir)/services/plugins/unity/unityWindowTracker
33
 
libunity_la_CPPFLAGS += -I$(top_builddir)/include
34
 
 
35
 
libunity_la_LDFLAGS =
36
 
libunity_la_LDFLAGS += @PLUGIN_LDFLAGS@
37
 
 
38
 
libunity_la_LIBADD =
39
 
libunity_la_LIBADD += @COMMON_XLIBS@
40
 
libunity_la_LIBADD += @XCOMPOSITE_LIBS@
41
 
libunity_la_LIBADD += @GTK_LIBS@
42
 
libunity_la_LIBADD += @GTKMM_LIBS@
43
 
libunity_la_LIBADD += @GIO_LIBS@
44
 
libunity_la_LIBADD += @LIBPNG_LIBS@
45
 
libunity_la_LIBADD += @URIPARSER_LIBS@
46
 
libunity_la_LIBADD += @VMTOOLS_LIBS@
47
 
libunity_la_LIBADD += $(top_builddir)/lib/appUtil/libAppUtil.la
48
 
libunity_la_LIBADD += $(top_builddir)/lib/image/libImage.la
49
 
libunity_la_LIBADD += $(top_builddir)/lib/raster/libRaster.la
50
 
libunity_la_LIBADD += $(top_builddir)/lib/region/libRegion.la
51
 
libunity_la_LIBADD += $(top_builddir)/lib/xdg/libXdg.la
52
 
 
53
 
libunity_la_SOURCES =
54
 
 
55
 
libunity_la_SOURCES += toolsPlugin.cpp
56
 
libunity_la_SOURCES += unityPlugin.cpp
57
 
libunity_la_SOURCES += unityPluginEntry.cpp
58
 
libunity_la_SOURCES += unityPlugin.h
59
 
libunity_la_SOURCES += unityPluginPosix.h
60
 
libunity_la_SOURCES += unityPluginPosix.cpp
61
 
libunity_la_SOURCES += ghiTclo.h
62
 
libunity_la_SOURCES += ghiTclo.cpp
63
 
libunity_la_SOURCES += unityTclo.h
64
 
libunity_la_SOURCES += unityTclo.cpp
65
 
 
66
 
libunity_la_SOURCES += ghIntegration/ghIntegration.cpp
67
 
libunity_la_SOURCES += ghIntegration/ghIntegrationInt.h
68
 
libunity_la_SOURCES += ghIntegration/icon.cc
69
 
libunity_la_SOURCES += ghIntegration/platform.cc
70
 
libunity_la_SOURCES += ghIntegration/pseudoAppMgr.cc
71
 
 
72
 
libunity_la_SOURCES += unitylib/unity.c
73
 
libunity_la_SOURCES += unitylib/unityPlatform.h
74
 
libunity_la_SOURCES += unitylib/unityPlatformX11.cc
75
 
libunity_la_SOURCES += unitylib/unityPlatformX11Settings.cc
76
 
libunity_la_SOURCES += unitylib/unityPlatformX11Window.cc
77
 
libunity_la_SOURCES += unitylib/unityX11.h
78
 
libunity_la_SOURCES += unitylib/windowPathFactory.cc
79
 
libunity_la_SOURCES += unitylib/x11Event.cc
80
 
libunity_la_SOURCES += unitylib/x11Util.cc
81
 
 
82
 
libunity_la_SOURCES += unityWindowTracker/unityWindowTracker.c
83
 
 
84
 
RPCGEN_SRCS =
85
 
RPCGEN_SRCS += ghiGetBinaryHandlers_xdr.c
86
 
RPCGEN_SRCS += ghiGetExecInfoHash_xdr.c
87
 
RPCGEN_SRCS += ghiProtocolHandler_xdr.c
88
 
RPCGEN_SRCS += ghiStartMenu_xdr.c
89
 
RPCGEN_SRCS += ghiShellAction_xdr.c
90
 
RPCGEN_SRCS += ghiTrayIcon_xdr.c
91
 
RPCGEN_SRCS += ghiSetFocusedWindow_xdr.c
92
 
RPCGEN_SRCS += ghiSetGuestHandler_xdr.c
93
 
RPCGEN_SRCS += ghiSetOutlookTempFolder_xdr.c
94
 
RPCGEN_SRCS += unityActive_xdr.c
95
 
RPCGEN_SRCS += unity_xdr.c
96
 
 
97
 
RPCGEN_HDRS =
98
 
RPCGEN_HDRS += ghiGetBinaryHandlers.h
99
 
RPCGEN_HDRS += ghiGetExecInfoHash.h
100
 
RPCGEN_HDRS += ghiProtocolHandler.h
101
 
RPCGEN_HDRS += ghiStartMenu.h
102
 
RPCGEN_HDRS += ghiShellAction.h
103
 
RPCGEN_HDRS += ghiTrayIcon.h
104
 
RPCGEN_HDRS += ghiSetFocusedWindow.h
105
 
RPCGEN_HDRS += ghiSetGuestHandler.h
106
 
RPCGEN_HDRS += ghiSetOutlookTempFolder.h
107
 
RPCGEN_HDRS += unityActive.h
108
 
RPCGEN_HDRS += unity.h
109
 
 
110
 
BUILT_SOURCES =
111
 
BUILT_SOURCES += $(RPCGEN_HDRS)
112
 
BUILT_SOURCES += $(RPCGEN_SRCS)
113
 
 
114
 
CLEANFILES =
115
 
CLEANFILES += $(BUILT_SOURCES)
116
 
 
117
 
libunity_la_SOURCES += $(RPCGEN_SRCS)
118
 
 
119
 
## `make clean` should also remove the copied headers.
120
 
clean-local:
121
 
        rm -rf $(top_builddir)/lib/include/guestrpc
122
 
        if [ $(top_builddir) != $(top_srcdir) ]; then   \
123
 
           rm -f *.x;                                   \
124
 
           rm -f ghiCommonDefines.h;                    \
125
 
        fi
126
 
 
127
 
ghiGetBinaryHandlers.h: ghiGetBinaryHandlers.x
128
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiGetBinaryHandlers.x $@ \
129
 
           services/plugins/unity/ghiCommonDefines.h
130
 
 
131
 
ghiGetBinaryHandlers_xdr.c: ghiGetBinaryHandlers.x ghiGetBinaryHandlers.h
132
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiGetBinaryHandlers.x $@
133
 
 
134
 
ghiGetExecInfoHash.h: ghiGetExecInfoHash.x
135
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiGetExecInfoHash.x $@ \
136
 
           services/plugins/unity/ghiCommonDefines.h
137
 
 
138
 
ghiGetExecInfoHash_xdr.c: ghiGetExecInfoHash.x ghiGetExecInfoHash.h
139
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiGetExecInfoHash.x $@
140
 
 
141
 
ghiProtocolHandler.h: ghiProtocolHandler.x
142
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiProtocolHandler.x $@ \
143
 
           services/plugins/unity/ghiCommonDefines.h
144
 
 
145
 
ghiProtocolHandler_xdr.c: ghiProtocolHandler.x ghiProtocolHandler.h
146
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiProtocolHandler.x $@
147
 
 
148
 
ghiStartMenu.h: ghiStartMenu.x
149
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiStartMenu.x $@ \
150
 
           services/plugins/unity/ghiCommonDefines.h
151
 
 
152
 
ghiStartMenu_xdr.c: ghiStartMenu.x ghiStartMenu.h
153
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiStartMenu.x $@
154
 
 
155
 
ghiShellAction.h: ghiShellAction.x
156
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiShellAction.x $@ \
157
 
           services/plugins/unity/ghiCommonDefines.h
158
 
 
159
 
ghiShellAction_xdr.c: ghiShellAction.x ghiShellAction.h
160
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiShellAction.x $@
161
 
 
162
 
ghiTrayIcon.h: ghiTrayIcon.x
163
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiTrayIcon.x $@ \
164
 
           services/plugins/unity/ghiCommonDefines.h
165
 
 
166
 
ghiTrayIcon_xdr.c: ghiTrayIcon.x ghiTrayIcon.h
167
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiTrayIcon.x $@
168
 
 
169
 
ghiSetFocusedWindow.h: ghiSetFocusedWindow.x
170
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiSetFocusedWindow.x $@ \
171
 
           services/plugins/unity/ghiCommonDefines.h
172
 
 
173
 
ghiSetFocusedWindow_xdr.c: ghiSetFocusedWindow.x ghiSetFocusedWindow.h
174
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiSetFocusedWindow.x $@
175
 
 
176
 
ghiSetGuestHandler.h: ghiSetGuestHandler.x
177
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiSetGuestHandler.x $@ \
178
 
           services/plugins/unity/ghiCommonDefines.h
179
 
 
180
 
ghiSetGuestHandler_xdr.c: ghiSetGuestHandler.x ghiSetGuestHandler.h
181
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiSetGuestHandler.x $@
182
 
 
183
 
ghiSetOutlookTempFolder.h: ghiSetOutlookTempFolder.x
184
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiSetOutlookTempFolder.x $@ \
185
 
           services/plugins/unity/ghiCommonDefines.h
186
 
 
187
 
ghiSetOutlookTempFolder_xdr.c: ghiSetOutlookTempFolder.x ghiSetOutlookTempFolder.h
188
 
        @RPCGEN_WRAPPER@ services/plugins/unity/ghiSetOutlookTempFolder.x $@
189
 
 
190
 
unityActive.h: unityActive.x
191
 
        @RPCGEN_WRAPPER@ services/plugins/unity/unityActive.x $@
192
 
 
193
 
unityActive_xdr.c: unityActive.x unityActive.h
194
 
        @RPCGEN_WRAPPER@ services/plugins/unity/unityActive.x $@
195
 
 
196
 
unity.h: unity.x
197
 
        @RPCGEN_WRAPPER@ services/plugins/unity/unity.x $@
198
 
 
199
 
unity_xdr.c: unity.x unity.h
200
 
        @RPCGEN_WRAPPER@ services/plugins/unity/unity.x $@
201