VirtualBox

Changeset 12446 in vbox for trunk/src/VBox/Additions/linux


Ignore:
Timestamp:
Sep 14, 2008 11:32:31 PM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
36521
Message:

Additions/Makefiles: Pushed them up to root (sub-makefile wise). Some cleanups, opengl omitted.

Location:
trunk/src/VBox/Additions/linux
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/linux/Makefile.kmk

    r12333 r12446  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../..
    24 else
    25 SUB_DEPTH = ..
    26 DEPTH    ?= ../../../..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924
     25#
     26# Include sub-makefiles.
     27#
    3028include $(PATH_SUB_CURRENT)/module/Makefile.kmk
    3129include $(PATH_SUB_CURRENT)/daemon/Makefile.kmk
    3230include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk
    3331
     32#
     33# Targets
     34#
    3435ifndef VBOX_OSE
    3536 PACKING     += $(PATH_BIN)/additions/VBoxLinuxAdditions.run
    … …  
    3940endif
    4041
     42#
     43# Globals
     44#
     45VBOX_LNX_ADD_INS_OUT_DIR           := $(PATH_TARGET)/Additions/Installer/linux
     46BLDDIRS                            += $(VBOX_LNX_ADD_INS_OUT_DIR)
    4147VBOX_PATH_LINUX_ADDITION_INSTALLER := $(PATH_SUB_CURRENT)/installer
    4248VBOX_PATH_X11_ADDITION_INSTALLER   := $(PATH_ROOT)/src/VBox/Additions/x11/installer
    4349
     50ifeq ($(KBUILD_TYPE),debug)
     51 VBOX_LNX_ADD_BIN_COPY              = $(CP) -f
     52 VBOX_LNX_ADD_BIN_COPY_SYMBOLS      = $(CP) -f
     53else
     54 VBOX_LNX_ADD_BIN_COPY              = objcopy -S -R .comment
     55 VBOX_LNX_ADD_BIN_COPY_SYMBOLS      = objcopy -g -R .comment
     56endif
     57
    4458include $(KBUILD_PATH)/subfooter.kmk
    4559
    46 ifeq ($(KBUILD_TYPE),debug)
    47  BIN_COPY         = $(CP) -f
    48  BIN_COPY_SYMBOLS = $(CP) -f
    49 else
    50  BIN_COPY         = objcopy -S -R .comment
    51  BIN_COPY_SYMBOLS = objcopy -g -R .comment
    52 endif
    5360
    5461#
    … …  
    99106                $(VBOX_VERSION_STAMP)
    100107        $(call MSG_L1,Creating $@)
    101         $(QUIET)$(MKDIR) -p $(PATH_TARGET)/install
     108        $(QUIET)$(MKDIR) -p $(VBOX_LNX_ADD_INS_OUT_DIR)
    102109# Remove target directory first, otherwise the behaviour of cp will not be
    103110# what we want if it already exists. See the cp manual page for more details.
    104         $(QUIET)rm -rf $(PATH_TARGET)/install/module
    105         $(QUIET)cp -af $(PATH_BIN)/additions/src $(PATH_TARGET)/install/module
    106         $(QUIET)$(MKDIR) -p $(PATH_TARGET)/install/module/test
    107         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test  $(PATH_TARGET)/install/module/test/Makefile
    108         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c         $(PATH_TARGET)/install/module/test/
    109         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxadd-timesync           $(PATH_TARGET)/install/vboxadd-timesync
    110         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxClient                 $(PATH_TARGET)/install/VBoxClient
    111         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/VBoxControl                $(PATH_TARGET)/install/VBoxControl
     111        $(QUIET)$(RM) -Rf -- $(VBOX_LNX_ADD_INS_OUT_DIR)/module
     112        $(QUIET)cp -af $(PATH_BIN)/additions/src $(VBOX_LNX_ADD_INS_OUT_DIR)/module
     113        $(QUIET)$(MKDIR) -p $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test
     114        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test  $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test/Makefile
     115        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c         $(VBOX_LNX_ADD_INS_OUT_DIR)/module/test/
     116        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxadd-timesync           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxadd-timesync
     117        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxClient                 $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxClient
     118        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/VBoxControl                $(VBOX_LNX_ADD_INS_OUT_DIR)/VBoxControl
    112119        $(QUIET)$(SED) \
    113120            -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
    … …  
    116123            -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
    117124            -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
    118             < $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh > $(PATH_TARGET)/install/install_.sh
    119         $(QUIET)$(INSTALL) -m 0755 $(PATH_TARGET)/install/install_.sh $(PATH_TARGET)/install/install.sh
    120         $(QUIET)$(RM) $(PATH_TARGET)/install/install_.sh
    121         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh          $(PATH_TARGET)/install
    122         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(PATH_TARGET)/install
    123         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient     $(PATH_TARGET)/install
    124         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop    $(PATH_TARGET)/install
    125         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh          $(PATH_TARGET)/install
    126         $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh         $(PATH_TARGET)/install
    127         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids         $(PATH_TARGET)/install
    128         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl          $(PATH_TARGET)/install
    129         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl        $(PATH_TARGET)/install
    130         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi    $(PATH_TARGET)/install
    131         $(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o        $(PATH_TARGET)/install/vboxmouse_drv.o
    132         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so    $(PATH_TARGET)/install/vboxmouse_drv_70.so
    133         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so    $(PATH_TARGET)/install/vboxmouse_drv_71.so
    134         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so    $(PATH_TARGET)/install/vboxmouse_drv_14.so
    135         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so    $(PATH_TARGET)/install/vboxmouse_drv_15.so
    136         $(QUIET)$(BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o        $(PATH_TARGET)/install/vboxvideo_drv.o
    137         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so    $(PATH_TARGET)/install/vboxvideo_drv_70.so
    138         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so    $(PATH_TARGET)/install/vboxvideo_drv_71.so
    139         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so    $(PATH_TARGET)/install/vboxvideo_drv_13.so
    140         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so    $(PATH_TARGET)/install/vboxvideo_drv_14.so
    141         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so    $(PATH_TARGET)/install/vboxvideo_drv_15.so
    142         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/mountvboxsf            $(PATH_TARGET)/install/mount.vboxsf
    143         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh $(PATH_TARGET)/install
     125            --output $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh \
     126            $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/install.sh
     127        $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh $(VBOX_LNX_ADD_INS_OUT_DIR)/install.sh
     128        $(QUIET)$(RM) $(VBOX_LNX_ADD_INS_OUT_DIR)/install_.sh
     129        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/VBoxRandR.sh          $(VBOX_LNX_ADD_INS_OUT_DIR)
     130        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd-timesync.sh $(VBOX_LNX_ADD_INS_OUT_DIR)
     131        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient     $(VBOX_LNX_ADD_INS_OUT_DIR)
     132        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop    $(VBOX_LNX_ADD_INS_OUT_DIR)
     133        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxadd.sh          $(VBOX_LNX_ADD_INS_OUT_DIR)
     134        $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Installer/linux/routines.sh         $(VBOX_LNX_ADD_INS_OUT_DIR)
     135        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids         $(VBOX_LNX_ADD_INS_OUT_DIR)
     136        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl          $(VBOX_LNX_ADD_INS_OUT_DIR)
     137        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl        $(VBOX_LNX_ADD_INS_OUT_DIR)
     138        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi    $(VBOX_LNX_ADD_INS_OUT_DIR)
     139        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o       $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv.o
     140        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so
     141        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_71.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_71.so
     142        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_14.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_14.so
     143        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_15.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_15.so
     144        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxvideo_drv.o       $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv.o
     145        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_70.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_70.so
     146        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_71.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_71.so
     147        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_13.so
     148        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_14.so
     149        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_15.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxvideo_drv_15.so
     150        $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/mountvboxsf                   $(VBOX_LNX_ADD_INS_OUT_DIR)/mount.vboxsf
     151        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/vboxvfs.sh          $(VBOX_LNX_ADD_INS_OUT_DIR)
    144152ifdef VBOX_SELINUX_CMPLD
    145         $(QUIET)$(INSTALL) -m 0755 $(VBOX_SELINUX_CMPLD)                            $(PATH_TARGET)/install
     153        $(QUIET)$(INSTALL) -m 0755 $(VBOX_SELINUX_CMPLD)                                     $(VBOX_LNX_ADD_INS_OUT_DIR)
    146154endif
    147         $(QUIET)$(VBOX_MAKESELF) $(PATH_TARGET)/install $@ \
     155        $(QUIET)$(VBOX_MAKESELF) $(VBOX_LNX_ADD_INS_OUT_DIR) $@ \
    148156                "VirtualBox $(VBOX_VERSION_STRING) Guest Additions for Linux installation" /bin/sh ./install.sh "> /dev/null"
    149157

  • trunk/src/VBox/Additions/linux/daemon/Makefile.kmk

    r12170 r12446  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../../..
    24 else
    25 DEPTH    ?= ../../../../..
    26 SUB_DEPTH = ../..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924

  • trunk/src/VBox/Additions/linux/module/Makefile.kmk

    r12170 r12446  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../../..
    24 else
    25 DEPTH    ?= ../../../../..
    26 SUB_DEPTH = ../..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

    r12170 r12446  
    2020#
    2121
    22 ifdef VBOX_SINGLE_MAKEFILE
    2322SUB_DEPTH = ../../../../..
    24 else
    25 DEPTH    ?= ../../../../..
    26 SUB_DEPTH = ../..
    27 endif
    2823include $(KBUILD_PATH)/subheader.kmk
    2924
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette