← 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/VBoxGuest/linux/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/VBoxGuest/linux/Makefile
1
 
# $Revision: 66903 $
 
1
# $Revision: 33184 $
2
2
## @file
3
3
# VirtualBox Guest Additions Module Makefile.
4
4
#
63
63
OBJS   = \
64
64
        VBoxGuest-linux.o \
65
65
        VBoxGuest.o \
 
66
        VBoxGuest2.o \
66
67
        GenericRequest.o \
67
68
        HGCMInternal.o \
68
69
        Init.o \
113
114
        common/string/strformattype.o \
114
115
        common/string/strprintf.o \
115
116
        common/string/strtonum.o \
 
117
        common/time/time.o \
116
118
        generic/RTAssertShouldPanic-generic.o \
117
119
        generic/RTLogWriteStdErr-stub-generic.o \
118
120
        generic/RTLogWriteStdOut-stub-generic.o \
 
121
        generic/RTSemEventWait-2-ex-generic.o \
 
122
        generic/RTSemEventWaitNoResume-2-ex-generic.o \
 
123
        generic/RTSemEventMultiWait-2-ex-generic.o \
 
124
        generic/RTSemEventMultiWaitNoResume-2-ex-generic.o \
119
125
        VBox/log-vbox.o \
120
126
        VBox/logbackdoor.o
121
127
ifeq ($(BUILD_TARGET_ARCH),x86)