← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox/trusty-proposed

« back to all changes in this revision

Viewing changes to src/VBox/Main/testcase/Makefile.kmk

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-03-07 16:38:36 UTC
  • mfrom: (1.1.13) (3.1.20 experimental)
  • Revision ID: package-import@ubuntu.com-20130307163836-p93jpbgx39tp3gb4
Tags: 4.2.8-dfsg-0ubuntu1
http://bugs.debian.org/691148
http://bugs.debian.org/700823
https://launchpad.net/bugs/1101867
http://bugs.debian.org/700479
http://bugs.debian.org/686994
http://bugs.debian.org/680053
* New upstream release. (Closes: #691148)
  - Fixes compatibility with kernel 3.8. (Closes: #700823; LP: #1101867)
* Switch to my @debian.org email address.
* Move package to contrib as virtualbox 4.2 needs a non-free compiler to
  build the BIOS.
* Build-depend on libdevmapper-dev.
* Refresh patches.
  - Drop 36-fix-ftbfs-xserver-112.patch, cve-2012-3221.patch,
    CVE-2013-0420.patch 37-kcompat-3.6.patch and 38-kcompat-3.7.patch.
* Drop all virtualbox-ose transitional packages.
* Drop the virtualbox-fuse package as vdfuse fails to build with
  virtualbox 4.2.
* Update install files and VBox.sh.
* Bump required kbuild version to 0.1.9998svn2577.
* Fix path to VBoxCreateUSBNode.sh in virtualbox.postinst. (Closes: #700479)
* Add an init script to virtuabox-guest-x11 which loads the vboxvideo
  kernel module. The X Server 1.13 doesn't load it anymore. (Closes: #686994)
* Update man pages. (Closes: #680053)
* Add 36-python-multiarch.patch from Rico Tzschichholz to fix detection of
  python in multiarch paths using pkg-config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/testcase/Makefile.kmk
4
4
#
5
5
 
6
6
#
7
 
# Copyright (C) 2006-2011 Oracle Corporation
 
7
# Copyright (C) 2004-2012 Oracle Corporation
8
8
#
9
9
# This file is part of VirtualBox Open Source Edition (OSE), as
10
10
# available from http://www.virtualbox.org. This file is free software;
28
28
        $(if $(VBOX_OSE),,tstOVF) \
29
29
        $(if $(VBOX_WITH_XPCOM),tstVBoxAPILinux,tstVBoxAPIWin) \
30
30
        $(if $(VBOX_WITH_RESOURCE_USAGE_API),tstCollector,) \
31
 
        $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlParseBuffer,)
 
31
        $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlParseBuffer,) \
 
32
        $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlContextID,)
32
33
  PROGRAMS.linux += \
33
34
        $(if $(VBOX_WITH_USB),tstUSBProxyLinux,)
34
35
 endif # !VBOX_WITH_TESTCASES
142
143
tstCollector_INCS     = ../include
143
144
tstCollector_DEFS    += VBOX_COLLECTOR_TEST_CASE
144
145
tstCollector_LDFLAGS.darwin  += -lproc
145
 
tstCollector_LDFLAGS.solaris += -lkstat
 
146
tstCollector_LDFLAGS.solaris += -lkstat -lnvpair
146
147
tstCollector_LDFLAGS.win     += psapi.lib powrprof.lib
147
148
 
148
149
 
150
151
# tstGuestCtrlParseBuffer
151
152
#
152
153
tstGuestCtrlParseBuffer_TEMPLATE = VBOXMAINCLIENTEXE
 
154
tstGuestCtrlParseBuffer_DEFS    += VBOX_WITH_HGCM VBOX_WITH_GUEST_CONTROL
153
155
tstGuestCtrlParseBuffer_SOURCES  = \
154
156
        tstGuestCtrlParseBuffer.cpp \
155
 
        ../src-client/GuestCtrlIO.cpp
 
157
        ../src-client/GuestCtrlPrivate.cpp
156
158
tstGuestCtrlParseBuffer_INCS     = ../include
157
159
ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
158
160
 tstGuestCtrlParseBuffer_DEPS    = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
162
164
 
163
165
 
164
166
#
 
167
# tstGuestCtrlContextID
 
168
#
 
169
tstGuestCtrlContextID_TEMPLATE = VBOXMAINCLIENTEXE
 
170
tstGuestCtrlContextID_DEFS    += VBOX_WITH_HGCM VBOX_WITH_GUEST_CONTROL
 
171
tstGuestCtrlContextID_SOURCES  = \
 
172
        tstGuestCtrlContextID.cpp \
 
173
        ../src-client/GuestCtrlPrivate.cpp
 
174
tstGuestCtrlContextID_INCS     = ../include
 
175
ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
 
176
 tstGuestCtrlContextID_DEPS    = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 
177
else
 
178
 tstGuestCtrlContextID_DEPS    = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
179
endif
 
180
 
 
181
 
 
182
#
165
183
# tstUSBProxyLinux
166
184
#
167
185
tstUSBProxyLinux_TEMPLATE  = VBOXR3TSTNPEXE
183
201
tstUSBProxyLinux_DEPS     = \
184
202
        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
185
203
tstUSBProxyLinux_LIBS     += \
186
 
        $(PATH_OUT)/lib/USBLib.a
 
204
        $(PATH_OUT)/lib/USBLib.a \
 
205
        $(PATH_OUT)/lib/VBoxCOM.a
187
206
 
188
207
 
189
208
# generate rules.
190
 
include $(KBUILD_PATH)/subfooter.kmk
 
209
include $(FILE_KBUILD_SUB_FOOTER)
191
210