← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to modules/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Makefile.in
112
112
FGREP = @FGREP@
113
113
FUSE_CPPFLAGS = @FUSE_CPPFLAGS@
114
114
FUSE_LIBS = @FUSE_LIBS@
 
115
GIO_CPPFLAGS = @GIO_CPPFLAGS@
 
116
GIO_LIBS = @GIO_LIBS@
115
117
GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
116
118
GLIB2_LIBS = @GLIB2_LIBS@
117
119
GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@
127
129
GTK_LIBS = @GTK_LIBS@
128
130
HAVE_DOT = @HAVE_DOT@
129
131
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 
132
HGFS_LIBS = @HGFS_LIBS@
130
133
ICU_CPPFLAGS = @ICU_CPPFLAGS@
131
134
ICU_LIBS = @ICU_LIBS@
132
135
INSTALL = @INSTALL@
134
137
INSTALL_PROGRAM = @INSTALL_PROGRAM@
135
138
INSTALL_SCRIPT = @INSTALL_SCRIPT@
136
139
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 
140
INSTVMSG = @INSTVMSG@
137
141
KERNEL_RELEASE = @KERNEL_RELEASE@
138
142
LD = @LD@
139
143
LDFLAGS = @LDFLAGS@
146
150
LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
147
151
LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
148
152
LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
 
153
LINUXINCLUDE = @LINUXINCLUDE@
149
154
LIPO = @LIPO@
150
155
LN_S = @LN_S@
151
156
LTLIBOBJS = @LTLIBOBJS@
180
185
RANLIB = @RANLIB@
181
186
RPCGEN = @RPCGEN@
182
187
RPCGENFLAGS = @RPCGENFLAGS@
 
188
RPCGEN_WRAPPER = @RPCGEN_WRAPPER@
183
189
SED = @SED@
184
190
SET_MAKE = @SET_MAKE@
185
191
SHELL = @SHELL@
196
202
VMTOOLS_CPPFLAGS = @VMTOOLS_CPPFLAGS@
197
203
VMTOOLS_LIBS = @VMTOOLS_LIBS@
198
204
VMUSR_PLUGIN_INSTALLDIR = @VMUSR_PLUGIN_INSTALLDIR@
199
 
VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
200
 
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
201
205
XDR_LIBS = @XDR_LIBS@
202
206
XMKMF = @XMKMF@
 
207
XSM_LIBS = @XSM_LIBS@
203
208
X_CFLAGS = @X_CFLAGS@
204
209
X_EXTRA_LIBS = @X_EXTRA_LIBS@
205
210
X_LIBS = @X_LIBS@
541
546
           MODULEBUILDDIR=$(modulesrc)/$(MODULES_OS)        \
542
547
           $(EXTRA_ARGS) -C "$(modulesrc)/$(MODULES_OS)/$@"
543
548
 
 
549
@LINUX_TRUE@export LINUXINCLUDE := @LINUXINCLUDE@
544
550
@LINUX_TRUE@export vmblockdir := $(MODULES_DIR)/fs/vmblock
545
551
@LINUX_TRUE@export vmcidir := $(MODULES_DIR)/drivers/misc
546
552
@LINUX_TRUE@export vmhgfsdir := $(MODULES_DIR)/fs/vmhgfs