← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libvmtools/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:
libvmtools/Makefile.in
88
88
am__installdirs = "$(DESTDIR)$(libdir)"
89
89
LTLIBRARIES = $(lib_LTLIBRARIES)
90
90
libvmtools_la_DEPENDENCIES = ../lib/lock/libLock.la \
91
 
        ../lib/backdoor/libBackdoor.la ../lib/conf/libConf.la \
92
 
        ../lib/dict/libDict.la ../lib/dynxdr/libDynxdr.la \
93
 
        ../lib/err/libErr.la ../lib/file/libFile.la \
94
 
        ../lib/guestApp/libGuestApp.la \
95
 
        ../lib/guestInfo/libGuestInfo.la \
96
 
        ../lib/guestRpc/libGuestRpc.la ../lib/hgfs/libHgfs.la \
97
 
        ../lib/message/libMessage.la ../lib/netUtil/libNetUtil.la \
98
 
        ../lib/panic/libPanic.la ../lib/procMgr/libProcMgr.la \
 
91
        ../lib/backdoor/libBackdoor.la ../lib/dict/libDict.la \
 
92
        ../lib/dynxdr/libDynxdr.la ../lib/err/libErr.la \
 
93
        ../lib/file/libFile.la ../lib/guestApp/libGuestApp.la \
 
94
        ../lib/guestRpc/libGuestRpc.la ../lib/message/libMessage.la \
 
95
        ../lib/netUtil/libNetUtil.la ../lib/panic/libPanic.la \
 
96
        ../lib/procMgr/libProcMgr.la \
99
97
        ../lib/rpcChannel/libRpcChannel.la ../lib/rpcOut/libRpcOut.la \
100
98
        ../lib/rpcVmx/libRpcVmx.la ../lib/string/libString.la \
101
99
        ../lib/syncDriver/libSyncDriver.la ../lib/system/libSystem.la \
104
102
        ../lib/vmSignal/libVmSignal.la ../lib/wiper/libWiper.la \
105
103
        ../lib/misc/libMisc.la $(am__append_1)
106
104
am_libvmtools_la_OBJECTS = libvmtools_la-fileLogger.lo \
107
 
        libvmtools_la-i18n.lo libvmtools_la-signalSource.lo \
108
 
        libvmtools_la-stdLogger.lo libvmtools_la-sysLogger.lo \
109
 
        libvmtools_la-vmtools.lo libvmtools_la-vmtoolsConfig.lo \
110
 
        libvmtools_la-vmtoolsLog.lo libvmtools_la-vmxLogger.lo \
111
 
        libvmtools_la-rpcin.lo libvmtools_la-stub-log.lo
 
105
        libvmtools_la-i18n.lo libvmtools_la-monotonicTimer.lo \
 
106
        libvmtools_la-signalSource.lo libvmtools_la-stdLogger.lo \
 
107
        libvmtools_la-sysLogger.lo libvmtools_la-vmtools.lo \
 
108
        libvmtools_la-vmtoolsConfig.lo libvmtools_la-vmtoolsLog.lo \
 
109
        libvmtools_la-vmxLogger.lo libvmtools_la-rpcin.lo \
 
110
        libvmtools_la-stub-log.lo
112
111
libvmtools_la_OBJECTS = $(am_libvmtools_la_OBJECTS)
113
112
libvmtools_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
114
113
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
167
166
FGREP = @FGREP@
168
167
FUSE_CPPFLAGS = @FUSE_CPPFLAGS@
169
168
FUSE_LIBS = @FUSE_LIBS@
 
169
GIO_CPPFLAGS = @GIO_CPPFLAGS@
 
170
GIO_LIBS = @GIO_LIBS@
170
171
GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
171
172
GLIB2_LIBS = @GLIB2_LIBS@
172
173
GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@
182
183
GTK_LIBS = @GTK_LIBS@
183
184
HAVE_DOT = @HAVE_DOT@
184
185
HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 
186
HGFS_LIBS = @HGFS_LIBS@
185
187
ICU_CPPFLAGS = @ICU_CPPFLAGS@
186
188
ICU_LIBS = @ICU_LIBS@
187
189
INSTALL = @INSTALL@
189
191
INSTALL_PROGRAM = @INSTALL_PROGRAM@
190
192
INSTALL_SCRIPT = @INSTALL_SCRIPT@
191
193
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 
194
INSTVMSG = @INSTVMSG@
192
195
KERNEL_RELEASE = @KERNEL_RELEASE@
193
196
LD = @LD@
194
197
LDFLAGS = @LDFLAGS@
201
204
LIB_AUTH_CPPFLAGS = @LIB_AUTH_CPPFLAGS@
202
205
LIB_IMPERSONATE_CPPFLAGS = @LIB_IMPERSONATE_CPPFLAGS@
203
206
LIB_USER_CPPFLAGS = @LIB_USER_CPPFLAGS@
 
207
LINUXINCLUDE = @LINUXINCLUDE@
204
208
LIPO = @LIPO@
205
209
LN_S = @LN_S@
206
210
LTLIBOBJS = @LTLIBOBJS@
235
239
RANLIB = @RANLIB@
236
240
RPCGEN = @RPCGEN@
237
241
RPCGENFLAGS = @RPCGENFLAGS@
 
242
RPCGEN_WRAPPER = @RPCGEN_WRAPPER@
238
243
SED = @SED@
239
244
SET_MAKE = @SET_MAKE@
240
245
SHELL = @SHELL@
251
256
VMTOOLS_CPPFLAGS = @VMTOOLS_CPPFLAGS@
252
257
VMTOOLS_LIBS = @VMTOOLS_LIBS@
253
258
VMUSR_PLUGIN_INSTALLDIR = @VMUSR_PLUGIN_INSTALLDIR@
254
 
VMWARE_USER_CPPFLAGS = @VMWARE_USER_CPPFLAGS@
255
 
VMWARE_USER_LDADD = @VMWARE_USER_LDADD@
256
259
XDR_LIBS = @XDR_LIBS@
257
260
XMKMF = @XMKMF@
 
261
XSM_LIBS = @XSM_LIBS@
258
262
X_CFLAGS = @X_CFLAGS@
259
263
X_EXTRA_LIBS = @X_EXTRA_LIBS@
260
264
X_LIBS = @X_LIBS@
320
324
top_srcdir = @top_srcdir@
321
325
lib_LTLIBRARIES = libvmtools.la
322
326
libvmtools_la_LIBADD = ../lib/lock/libLock.la \
323
 
        ../lib/backdoor/libBackdoor.la ../lib/conf/libConf.la \
324
 
        ../lib/dict/libDict.la ../lib/dynxdr/libDynxdr.la \
325
 
        ../lib/err/libErr.la ../lib/file/libFile.la \
326
 
        ../lib/guestApp/libGuestApp.la \
327
 
        ../lib/guestInfo/libGuestInfo.la \
328
 
        ../lib/guestRpc/libGuestRpc.la ../lib/hgfs/libHgfs.la \
329
 
        ../lib/message/libMessage.la ../lib/netUtil/libNetUtil.la \
330
 
        ../lib/panic/libPanic.la ../lib/procMgr/libProcMgr.la \
 
327
        ../lib/backdoor/libBackdoor.la ../lib/dict/libDict.la \
 
328
        ../lib/dynxdr/libDynxdr.la ../lib/err/libErr.la \
 
329
        ../lib/file/libFile.la ../lib/guestApp/libGuestApp.la \
 
330
        ../lib/guestRpc/libGuestRpc.la ../lib/message/libMessage.la \
 
331
        ../lib/netUtil/libNetUtil.la ../lib/panic/libPanic.la \
 
332
        ../lib/procMgr/libProcMgr.la \
331
333
        ../lib/rpcChannel/libRpcChannel.la ../lib/rpcOut/libRpcOut.la \
332
334
        ../lib/rpcVmx/libRpcVmx.la ../lib/string/libString.la \
333
335
        ../lib/syncDriver/libSyncDriver.la ../lib/system/libSystem.la \
340
342
# Recompile the rpcIn library with GLIB support.
341
343
 
342
344
# Recompile the stub for Log_* functions, but not Log() itself (see -DNO_LOG_STUB).
343
 
libvmtools_la_SOURCES = fileLogger.c i18n.c signalSource.c stdLogger.c \
344
 
        sysLogger.c vmtools.c vmtoolsConfig.c vmtoolsLog.c vmxLogger.c \
 
345
libvmtools_la_SOURCES = fileLogger.c i18n.c monotonicTimer.c \
 
346
        signalSource.c stdLogger.c sysLogger.c vmtools.c \
 
347
        vmtoolsConfig.c vmtoolsLog.c vmxLogger.c \
345
348
        $(top_srcdir)/lib/rpcIn/rpcin.c \
346
349
        $(top_srcdir)/lib/stubs/stub-log.c
347
350
libvmtools_la_CPPFLAGS = -DVMTOOLS_USE_GLIB -DNO_LOG_STUB \
427
430
 
428
431
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvmtools_la-fileLogger.Plo@am__quote@
429
432
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvmtools_la-i18n.Plo@am__quote@
 
433
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvmtools_la-monotonicTimer.Plo@am__quote@
430
434
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvmtools_la-rpcin.Plo@am__quote@
431
435
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvmtools_la-signalSource.Plo@am__quote@
432
436
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvmtools_la-stdLogger.Plo@am__quote@
472
476
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
473
477
@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvmtools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libvmtools_la-i18n.lo `test -f 'i18n.c' || echo '$(srcdir)/'`i18n.c
474
478
 
 
479
libvmtools_la-monotonicTimer.lo: monotonicTimer.c
 
480
@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvmtools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libvmtools_la-monotonicTimer.lo -MD -MP -MF $(DEPDIR)/libvmtools_la-monotonicTimer.Tpo -c -o libvmtools_la-monotonicTimer.lo `test -f 'monotonicTimer.c' || echo '$(srcdir)/'`monotonicTimer.c
 
481
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libvmtools_la-monotonicTimer.Tpo $(DEPDIR)/libvmtools_la-monotonicTimer.Plo
 
482
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='monotonicTimer.c' object='libvmtools_la-monotonicTimer.lo' libtool=yes @AMDEPBACKSLASH@
 
483
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
484
@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvmtools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libvmtools_la-monotonicTimer.lo `test -f 'monotonicTimer.c' || echo '$(srcdir)/'`monotonicTimer.c
 
485
 
475
486
libvmtools_la-signalSource.lo: signalSource.c
476
487
@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvmtools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libvmtools_la-signalSource.lo -MD -MP -MF $(DEPDIR)/libvmtools_la-signalSource.Tpo -c -o libvmtools_la-signalSource.lo `test -f 'signalSource.c' || echo '$(srcdir)/'`signalSource.c
477
488
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libvmtools_la-signalSource.Tpo $(DEPDIR)/libvmtools_la-signalSource.Plo