← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/testPlugin/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:
tests/testPlugin/Makefile.am
51
51
EXTRA_DIST += testData.x
52
52
 
53
53
testData.h: testData.x
54
 
        if [ $(top_builddir) != $(top_srcdir) ]; then                   \
55
 
           cp -f $(top_srcdir)/tests/testPlugin/testData.x $(builddir); \
56
 
        fi
57
 
        $(RPCGEN) $(RPCGENFLAGS) -h -o $@ $(builddir)/testData.x
58
 
        $(SED) 's,rpc/rpc\.h,vmxrpc.h,' $@ > $@.tmp
59
 
        mv $@.tmp $@
 
54
        @RPCGEN_WRAPPER@ tests/testPlugin/testData.x $@
60
55
 
61
56
testData_xdr.c: testData.x testData.h
62
 
        $(RPCGEN) $(RPCGENFLAGS) -c -o $@ $(builddir)/testData.x
 
57
        @RPCGEN_WRAPPER@ tests/testPlugin/testData.x $@
63
58