~ubuntu-branches/ubuntu/karmic/virtualbox-ose/karmic-updates

« back to all changes in this revision

Viewing changes to src/VBox/Additions/x11/vboxmouse/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-09-14 18:25:07 UTC
  • mfrom: (0.4.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090914182507-c98g07mq16hjmn6d
Tags: 3.0.6-dfsg-1ubuntu1
* Merge from debian unstable (LP: #429697), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
  - virtualbox, virtualbox-* (names of the upstream proprietary packages)
    conflict with virtualbox-ose (LP: #379878)
* Make debug package depend on normal or guest utils package
* Drop patches/22-pulseaudio-stubs.dpatch (applied upstream)
* Rename Ubuntu specific patches to uXX-*.dpatch
* Fix lintian warnings in maintainer scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
143
143
vboxmouse_drv_16_SOURCES = \
144
144
        vboxmouse_15.c
145
145
 
 
146
 
 
147
#
 
148
# vboxmouse_drv_17
 
149
#
 
150
DLLS += vboxmouse_drv_17
 
151
vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
 
152
vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 
153
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
 
154
vboxmouse_drv_17_INCS := \
 
155
        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
 
156
        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
 
157
        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
 
158
        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
 
159
        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
 
160
        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
 
161
        $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \
 
162
        $(PATH_SUB_CURRENT)
 
163
vboxmouse_drv_17_SOURCES = \
 
164
        vboxmouse_15.c
 
165
 
 
166
 
146
167
# Check the undefined symbols in the X.Org modules against lists of allowed
147
168
# symbols.  Not very elegant, but it will catch problems early.
148
169
ifdef VBOX_WITH_TESTCASES
196
217
            $(INSTARGET_vboxmouse_drv_16) $(OUR_PATH_VBOXMOUSE)/undefined_16
197
218
        $(QUIET)$(APPEND) -t "$@" "done"
198
219
 
 
220
     TESTING  += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
 
221
     OTHERS += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
 
222
$$(PATH_vboxmouse_drv_17)/tstvboxmouse17.run: $$(INSTARGET_vboxmouse_drv_17)
 
223
        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
 
224
            $(INSTARGET_vboxmouse_drv_17) $(OUR_PATH_VBOXMOUSE)/undefined_15
 
225
        $(QUIET)$(APPEND) -t "$@" "done"
 
226
 
199
227
    endif # ! VBOX_ONLY_SDK
200
228
   endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
201
229
  endif # eq ($(KBUILD_TARGET),linux)