← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VirtualBox/Makefile.kmk
1
 
# $Id: Makefile.kmk 38421 2011-08-11 14:55:02Z vboxsync $
 
1
# $Id: Makefile.kmk $
2
2
## @file
3
3
# Makefile for the VirtualBox Qt GUI.
4
4
#
129
129
        $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \
130
130
        $(if $(VBOX_WITH_VDE),VBOX_WITH_VDE) \
131
131
        $(if $(VBOX_WITH_UDPTUNNEL),VBOX_WITH_UDPTUNNEL) \
 
132
        $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK) \
132
133
        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI) \
133
134
        $(if $(VBOX_GUI_WITH_PIDFILE),VBOX_GUI_WITH_PIDFILE) \
134
135
        $(if $(VBOX_GUI_WITH_KEYS_RESET_HANDLER),VBOX_GUI_WITH_KEYS_RESET_HANDLER) \
145
146
else ifdef VBOX_GUI_USE_QGL
146
147
 VirtualBox_DEFS        += VBOX_GUI_USE_QGL
147
148
endif
 
149
ifdef VBOX_WITH_CROGL
 
150
 VirtualBox_DEFS        += VBOX_WITH_CROGL
 
151
endif
148
152
ifdef VBOX_WITH_VIRTIO
149
153
 VirtualBox_DEFS        += VBOX_WITH_VIRTIO
150
154
endif
270
274
        src/UIMediumTypeChangeDialog.h \
271
275
        src/VBoxSnapshotDetailsDlg.h \
272
276
        src/VBoxTakeSnapshotDlg.h \
273
 
        src/VBoxUpdateDlg.h \
274
277
        src/VBoxVMInformationDlg.h \
275
278
        src/VBoxVMLogViewer.h \
276
279
        src/VBoxLicenseViewer.h \
352
355
        src/widgets/VBoxOSTypeSelectorWidget.h \
353
356
        src/widgets/VBoxWarningPane.h \
354
357
        src/net/UINetworkManager.h \
 
358
        src/net/UIUpdateManager.h \
355
359
        src/net/UIDownloader.h \
356
360
        src/net/UIDownloaderAdditions.h \
357
361
        src/net/UIDownloaderUserManual.h \
 
362
        src/net/UIDownloaderExtensionPack.h \
358
363
        src/selector/UIActionPoolSelector.h \
359
364
        src/selector/UIVMDesktop.h \
360
365
        src/selector/UIVMListView.h \
439
444
        src/VBoxMedium.cpp \
440
445
        src/VBoxSnapshotDetailsDlg.cpp \
441
446
        src/VBoxTakeSnapshotDlg.cpp \
442
 
        src/VBoxUpdateDlg.cpp \
443
447
        src/VBoxVMInformationDlg.cpp \
444
448
        src/VBoxVMLogViewer.cpp \
445
449
        src/VBoxLicenseViewer.cpp \
525
529
        src/widgets/VBoxOSTypeSelectorWidget.cpp \
526
530
        src/widgets/VBoxWarningPane.cpp \
527
531
        src/net/UINetworkManager.cpp \
 
532
        src/net/UIUpdateDefs.cpp \
 
533
        src/net/UIUpdateManager.cpp \
528
534
        src/net/UIDownloader.cpp \
529
535
        src/net/UIDownloaderAdditions.cpp \
530
536
        src/net/UIDownloaderUserManual.cpp \
 
537
        src/net/UIDownloaderExtensionPack.cpp \
531
538
        src/selector/UIActionPoolSelector.cpp \
532
539
        src/selector/UISelectorShortcuts.cpp \
533
540
        src/selector/UIVMDesktop.cpp \