← 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 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:
Makefile.am
22
22
# that all of our macros are in the 'm4' subdirectory.
23
23
ACLOCAL_AMFLAGS = -I m4
24
24
 
25
 
# These subdirectories require X, and may be disabled using --without-x
26
 
X11_SUBDIRS =
27
 
X11_SUBDIRS += vmware-user
28
 
X11_SUBDIRS += vmware-user-suid-wrapper
29
 
 
30
25
SUBDIRS =
31
26
SUBDIRS += lib
32
27
SUBDIRS += libvmtools
33
 
if HAVE_X11
34
 
   SUBDIRS += $(X11_SUBDIRS)
35
 
endif
 
28
SUBDIRS += libhgfs
36
29
SUBDIRS += hgfsclient
37
30
if BUILD_HGFSMOUNTER
38
31
   SUBDIRS += hgfsmounter
43
36
SUBDIRS += scripts
44
37
SUBDIRS += services
45
38
SUBDIRS += toolbox
 
39
if HAVE_X11
 
40
   SUBDIRS += vmware-user-suid-wrapper
 
41
endif
46
42
if HAVE_FUSE
47
43
   SUBDIRS += vmblock-fuse
48
44
endif
 
45
if !LINUX
 
46
   SUBDIRS += vmblockmounter
 
47
endif
49
48
SUBDIRS += xferlogs
50
49
if ENABLE_TESTS
51
50
   SUBDIRS += tests