← 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/Makefile.kmk

  • 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/Makefile.kmk
94
94
 vboxguest-src_INST     = $(INST_ADDITIONS)src/vboxguest/
95
95
 vboxguest-src_MODE     = a+r,u+w
96
96
 vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
97
 
 vboxguest-src_SOURCES += $(if $(VBOX_OSE),,$(vboxguest-sh_0_OUTDIR)/dkms.conf)
98
 
 vboxguest-src_CLEAN    = $(vboxguest-sh_0_OUTDIR)/dkms.conf
 
97
 
 
98
 INSTALLS += vboxguest-dkms-conf
 
99
 vboxguest-dkms-conf_INST    = $(INST_ADDITIONS)src/
 
100
 vboxguest-dkms-conf_MODE    = a+r,u+w
 
101
 vboxguest-dkms-conf_SOURCES = $(vboxguest-sh_0_OUTDIR)/dkms.conf
 
102
 vboxguest-dkms-conf_CLEAN   = $(vboxguest-sh_0_OUTDIR)/dkms.conf
 
103
 
 
104
 INSTALLS += vboxguest-dkms-sh
 
105
 vboxguest-dkms-sh_INST    = $(INST_ADDITIONS)src/
 
106
 vboxguest-dkms-sh_MODE    = a+rx,u+w
 
107
 vboxguest-dkms-sh_SOURCES = $(vboxguest-sh_0_OUTDIR)/do_dkms
 
108
 vboxguest-dkms-sh_CLEAN   = $(vboxguest-sh_0_OUTDIR)/do_dkms
99
109
 
100
110
 $$(vboxguest-sh_0_OUTDIR)/dkms.conf: \
101
111
                $(PATH_SUB_CURRENT)/linux/dkms.conf \
102
112
                $(VBOX_VERSION_STAMP) \
103
113
                | $$(dir $$@)
104
114
        $(call MSG_TOOL,Creating,,$@)
105
 
        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
 
115
        $(QUIET)$(SED) \
 
116
                -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
 
117
                --output $@ $<
 
118
 
 
119
 $$(vboxguest-sh_0_OUTDIR)/do_dkms: \
 
120
                $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_dkms \
 
121
                $(VBOX_VERSION_STAMP) \
 
122
                | $$(dir $$@)
 
123
        $(call MSG_TOOL,Creating,,$@)
 
124
        $(QUIET)$(SED) \
 
125
                -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
 
126
                -e "s;_MODULE_;vboxguest;g" \
 
127
                -e "s;_OLDMODULES_;vboxguest vboxadd vboxsf vboxvfs vboxvideo;g" \
 
128
                --output $@ $<
106
129
 
107
130
 # scripts.
108
131
 INSTALLS += vboxguest-sh