← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/VBoxGuestLib/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/Additions/common/VBoxGuestLib/Makefile.kmk
25
25
#
26
26
# Target config.
27
27
#
28
 
LIBRARIES += \
29
 
        VBoxGuestR0Lib \
30
 
        VBoxGuestR0LibBase
 
28
ifdef VBOX_WITH_ADDITION_DRIVERS
 
29
 LIBRARIES += \
 
30
        VBoxGuestR0Lib \
 
31
        VBoxGuestR0LibBase
 
32
endif
31
33
LIBRARIES += \
32
34
        VBoxGuestR3Lib \
33
35
        VBoxGuestR3LibShared
34
36
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
35
37
 LIBRARIES += \
36
 
        VBoxGuestR3LibXFree86
37
 
endif
38
 
 
39
 
ifndef VBOX_WITH_ADDITION_DRIVERS
40
 
 if1of ($(KBUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
41
 
  LIBRARIES := $(filter-out VBoxGuestR0Lib VBoxGuestR0LibBase, $(LIBRARIES))
42
 
 endif
 
38
        VBoxGuestR3LibXFree86
43
39
endif
44
40
 
45
41
 
57
53
        Init.cpp \
58
54
        VMMDev.cpp \
59
55
        HGCM.cpp \
60
 
        VBoxCalls.c
 
56
        VBoxCalls.c \
 
57
        VbglR0CanUsePhysPageList.cpp
 
58
 
61
59
 
62
60
#
63
61
# VBoxGuestR0LibBase
72
70
        PhysHeap.cpp \
73
71
        Init.cpp \
74
72
        VMMDev.cpp \
75
 
        HGCMInternal.cpp
 
73
        HGCMInternal.cpp \
 
74
        VbglR0CanUsePhysPageList.cpp
76
75
 
77
76
#
78
77
# VBoxGuestR3Lib
84
83
VBoxGuestR3Lib_SOURCES     = \
85
84
        VBoxGuestR3Lib.cpp \
86
85
        VBoxGuestR3LibClipboard.cpp \
 
86
        VBoxGuestR3LibCredentials.cpp \
87
87
        VBoxGuestR3LibDaemonize.cpp \
88
88
        VBoxGuestR3LibGR.cpp \
89
 
        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
 
89
        $(if $(VBOX_WITH_GUEST_PROPS), \
 
90
                VBoxGuestR3LibGuestProp.cpp \
 
91
                VBoxGuestR3LibHostVersion.cpp,) \
90
92
        VBoxGuestR3LibMouse.cpp \
91
93
        VBoxGuestR3LibMisc.cpp \
92
94
        VBoxGuestR3LibSeamless.cpp \
95
97
ifeq ($(KBUILD_TARGET),win) ## @todo get rid of this hack (as soon as it's all implemented / #defined).
96
98
 VBoxGuestR3Lib_SOURCES   = \
97
99
        VBoxGuestR3Lib.cpp \
 
100
        VBoxGuestR3LibCredentials.cpp \
98
101
        VBoxGuestR3LibGR.cpp \
99
 
        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
 
102
        $(if $(VBOX_WITH_GUEST_PROPS), \
 
103
                VBoxGuestR3LibGuestProp.cpp \
 
104
                VBoxGuestR3LibHostVersion.cpp,) \
100
105
        VBoxGuestR3LibMisc.cpp \
101
106
        VBoxGuestR3LibTime.cpp
102
107
endif
103
 
 
 
108
#VBoxGuestR3LibMisc.cpp uses VBOX_SVN_REV.
 
109
VBoxGuestR3LibMisc.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
 
110
VBoxGuestR3LibMisc.cpp_DEPS = $(VBOX_SVN_REV_KMK)
104
111
 
105
112
#
106
113
# VBoxGuestR3LibShared - a PIC variant of VBoxGuestR3Lib for linking into .so/.dll/.dylib.