← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to .pc/18-system-xorg.patch/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/18-system-xorg.patch/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
1
 
# $Id: Makefile.kmk 38152 2011-07-25 12:19:13Z vboxsync $
 
1
# $Id: Makefile.kmk $
2
2
## @file
3
3
# Sub-Makefile for the VBox Additions XFree86 and X.org mouse drivers.
4
4
#
154
154
        vboxmouse_15.c
155
155
 
156
156
 
 
157
ifneq ($(KBUILD_TARGET), linux)
 
158
 
157
159
#
158
160
# vboxmouse_drv_17
159
161
#
233
235
vboxmouse_drv_110_SOURCES = \
234
236
        vboxmouse_15.c
235
237
 
 
238
endif # neq ($(KBUILD_TARGET),linux)
236
239
 
237
240
# Check the undefined symbols in the X.Org modules against lists of allowed
238
241
# symbols.  Not very elegant, but it will catch problems early.
301
304
            $(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15
302
305
        $(QUIET)$(APPEND) -t "$@" "done"
303
306
 
 
307
ifneq ($(KBUILD_TARGET), linux)
 
308
 
304
309
     TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
305
310
     OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
306
311
$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET)
333
338
            $(vboxmouse_drv_110_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15
334
339
        $(QUIET)$(APPEND) -t "$@" "done"
335
340
 
 
341
endif # neq ($(KBUILD_TARGET),linux)
 
342
 
336
343
    endif # ! VBOX_ONLY_SDK
337
344
   endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
338
 
  endif # eq ($(KBUILD_TARGET),linux)
 
345
  endif # 1of ($(KBUILD_TARGET),linux solaris)
339
346
# endif # ! VBOX_ONLY_ADDITIONS
340
347
endif # VBOX_WITH_TESTCASES
341
348