← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VBoxFB/Makefile.kmk

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VBoxFB/Makefile.kmk
4
4
#
5
5
 
6
6
#
7
 
# Copyright (C) 2006-2007 Sun Microsystems, Inc.
 
7
# Copyright (C) 2006-2009 Sun Microsystems, Inc.
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;
22
22
SUB_DEPTH = ../../../..
23
23
include $(KBUILD_PATH)/subheader.kmk
24
24
 
 
25
PROGRAMS += VBoxFB
 
26
 
25
27
#
26
28
# VBoxFB
27
29
#
28
 
PROGRAMS += VBoxFB
29
 
VBoxFB_SOURCES    = \
 
30
VBoxFB_TEMPLATE = VBOXR3NPEXE
 
31
VBoxFB_SOURCES  = \
30
32
        VBoxFB.cpp \
31
33
        Framebuffer.cpp \
32
34
        Helper.cpp
33
 
VBoxFB_DEFS       = IN_RING3 IN_RT_R3 _GNU_SOURCE
 
35
VBoxFB_CXXFLAGS = -Wno-non-virtual-dtor -fshort-wchar
34
36
ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
35
37
 VBoxFB_DEFS     += VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
36
38
endif
37
 
VBoxFB_INCS       = \
38
 
        /usr/include/directfb \
39
 
        $(VBOX_PATH_SDK)/include \
40
 
        $(VBOX_XPCOM_INCS)
41
 
VBoxFB_LIBS       = \
42
 
        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
43
 
        $(LIB_RUNTIME) \
44
 
        xpcomglue \
45
 
        nspr4 \
46
 
        plc4 \
47
 
        $(LIB_PTHREAD) \
48
 
        rt \
49
 
        directfb
50
 
VBoxFB_LIBPATH    = \
51
 
        $(LIBPATH_XPCOM)
52
 
VBoxFB_CXXFLAGS   =  \
53
 
        -DNDEBUG -DTRIMMED -O -Wall -fno-rtti -fno-exceptions \
54
 
        -Wno-non-virtual-dtor -Wno-long-long -fshort-wchar -pthread -pipe
 
39
VBoxFB_INCS     = $(VBOX_XPCOM_INCS) /usr/include/directfb
 
40
VBoxFB_LIBPATH  = $(LIBPATH_XPCOM)
 
41
VBoxFB_LIBS     = $(LIB_XPCOM) $(LIB_RUNTIME) directfb
 
42
VBoxFB_DEPS     = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
55
43
 
 
44
# generate rules.
56
45
include $(KBUILD_PATH)/subfooter.kmk
57
46