← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/VBoxGuest/linux/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/VBoxGuest/linux/Makefile
1
 
# $Revision: 61105 $
 
1
# $Revision: 65557 $
2
2
## @file
3
3
# VirtualBox Guest Additions Module Makefile.
4
4
#
5
5
 
6
6
#
7
 
# Copyright (C) 2006-2009 Oracle Corporation
 
7
# Copyright (C) 2006-2010 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;
219
219
  KBUILD_EXTMOD := $(shell pwd)
220
220
 endif
221
221
 INCL    += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
 
222
 INCL    += $(addprefix -I$(KBUILD_EXTMOD)/vboxguest,/ /include /r0drv/linux)
222
223
 export INCL
223
224
endif
224
225
KFLAGS   := -D__KERNEL__ -DMODULE \