← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to vmblock-fuse/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:
vmblock-fuse/Makefile.in
71
71
        main.$(OBJEXT) block.$(OBJEXT) stubs.$(OBJEXT)
72
72
vmware_vmblock_fuse_OBJECTS = $(am_vmware_vmblock_fuse_OBJECTS)
73
73
am__DEPENDENCIES_1 =
74
 
vmware_vmblock_fuse_DEPENDENCIES = ../lib/misc/libMisc.la \
75
 
        $(am__DEPENDENCIES_1)
 
74
vmware_vmblock_fuse_DEPENDENCIES = $(am__DEPENDENCIES_1)
76
75
DEFAULT_INCLUDES = -I.@am__isrc@
77
76
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
78
77
am__depfiles_maybe = depfiles
127
126
FGREP = @FGREP@
128
127
FUSE_CPPFLAGS = @FUSE_CPPFLAGS@
129
128
FUSE_LIBS = @FUSE_LIBS@
 
129
GIO_CPPFLAGS = @GIO_CPPFLAGS@
 
130
GIO_LIBS = @GIO_LIBS@
130
131
GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
131
132
GLIB2_LIBS = @GLIB2_LIBS@
132
133
GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@
142
143
GTK_LIBS = @GTK_LIBS@
143
144
HAVE_DOT = @HAVE_DOT@
144
145
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 
146
HGFS_LIBS = @HGFS_LIBS@
145
147
ICU_CPPFLAGS = @ICU_CPPFLAGS@
146
148
ICU_LIBS = @ICU_LIBS@
147
149
INSTALL = @INSTALL@
149
151
INSTALL_PROGRAM = @INSTALL_PROGRAM@
150
152
INSTALL_SCRIPT = @INSTALL_SCRIPT@
151
153
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 
154
INSTVMSG = @INSTVMSG@
152
155
KERNEL_RELEASE = @KERNEL_RELEASE@
153
156
LD = @LD@
154
157
LDFLAGS = @LDFLAGS@
161
164
LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
162
165
LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
163
166
LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
 
167
LINUXINCLUDE = @LINUXINCLUDE@
164
168
LIPO = @LIPO@
165
169
LN_S = @LN_S@
166
170
LTLIBOBJS = @LTLIBOBJS@
195
199
RANLIB = @RANLIB@
196
200
RPCGEN = @RPCGEN@
197
201
RPCGENFLAGS = @RPCGENFLAGS@
 
202
RPCGEN_WRAPPER = @RPCGEN_WRAPPER@
198
203
SED = @SED@
199
204
SET_MAKE = @SET_MAKE@
200
205
SHELL = @SHELL@
211
216
VMTOOLS_CPPFLAGS = @VMTOOLS_CPPFLAGS@
212
217
VMTOOLS_LIBS = @VMTOOLS_LIBS@
213
218
VMUSR_PLUGIN_INSTALLDIR = @VMUSR_PLUGIN_INSTALLDIR@
214
 
VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
215
 
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
216
219
XDR_LIBS = @XDR_LIBS@
217
220
XMKMF = @XMKMF@
 
221
XSM_LIBS = @XSM_LIBS@
218
222
X_CFLAGS = @X_CFLAGS@
219
223
X_EXTRA_LIBS = @X_EXTRA_LIBS@
220
224
X_LIBS = @X_LIBS@
285
289
# -D_FILE_OFFSET_BITS=64 required for fuse.
286
290
AM_CFLAGS = -Dvmblock_fuse -U_XOPEN_SOURCE -D_XOPEN_SOURCE=600 \
287
291
        -DUSERLEVEL -D_FILE_OFFSET_BITS=64 @FUSE_CPPFLAGS@ \
288
 
        @VMWARE_USER_CPPFLAGS@ -I$(top_srcdir)/modules/shared/vmblock \
 
292
        @GLIB2_CPPFLAGS@ -I$(top_srcdir)/modules/shared/vmblock \
289
293
        -I$(srcdir)
290
 
vmware_vmblock_fuse_LDADD = ../lib/misc/libMisc.la @FUSE_LIBS@ \
291
 
        $(am__append_1)
 
294
vmware_vmblock_fuse_LDADD = @FUSE_LIBS@ @GLIB2_LIBS@ $(am__append_1)
292
295
vmware_vmblock_fuse_SOURCES = util.c fsops.c main.c \
293
296
        $(top_srcdir)/modules/shared/vmblock/block.c \
294
297
        $(top_srcdir)/modules/shared/vmblock/stubs.c