← Back to branch summary

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

« back to all changes in this revision

Viewing changes to checkvm/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:
checkvm/Makefile.am
19
19
 
20
20
vmware_checkvm_SOURCES =
21
21
vmware_checkvm_SOURCES += checkvm.c
 
22
 
 
23
vmware_checkvm_LDADD =
 
24
vmware_checkvm_LDADD += @VMTOOLS_LIBS@
 
25
 
 
26
if HAVE_ICU
 
27
   vmware_checkvm_LDADD += @ICU_LIBS@
 
28
   vmware_checkvm_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS)     \
 
29
                            $(LIBTOOLFLAGS) --mode=link $(CXX)       \
 
30
                            $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 
31
                            $(LDFLAGS) -o $@
 
32
else
 
33
   vmware_checkvm_LINK = $(LINK)
 
34
endif
 
35