← 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.am

  • 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.am
20
20
libvmtools_la_LIBADD =
21
21
libvmtools_la_LIBADD += ../lib/lock/libLock.la
22
22
libvmtools_la_LIBADD += ../lib/backdoor/libBackdoor.la
23
 
libvmtools_la_LIBADD += ../lib/conf/libConf.la
24
23
libvmtools_la_LIBADD += ../lib/dict/libDict.la
25
24
libvmtools_la_LIBADD += ../lib/dynxdr/libDynxdr.la
26
25
libvmtools_la_LIBADD += ../lib/err/libErr.la
27
26
libvmtools_la_LIBADD += ../lib/file/libFile.la
28
27
libvmtools_la_LIBADD += ../lib/guestApp/libGuestApp.la
29
 
libvmtools_la_LIBADD += ../lib/guestInfo/libGuestInfo.la
30
28
libvmtools_la_LIBADD += ../lib/guestRpc/libGuestRpc.la
31
 
libvmtools_la_LIBADD += ../lib/hgfs/libHgfs.la
32
29
libvmtools_la_LIBADD += ../lib/message/libMessage.la
33
30
libvmtools_la_LIBADD += ../lib/netUtil/libNetUtil.la
34
31
libvmtools_la_LIBADD += ../lib/panic/libPanic.la
57
54
libvmtools_la_SOURCES =
58
55
libvmtools_la_SOURCES += fileLogger.c
59
56
libvmtools_la_SOURCES += i18n.c
 
57
libvmtools_la_SOURCES += monotonicTimer.c
60
58
libvmtools_la_SOURCES += signalSource.c
61
59
libvmtools_la_SOURCES += stdLogger.c
62
60
libvmtools_la_SOURCES += sysLogger.c