VirtualBox

Changeset 35380 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Dec 30, 2010 4:06:17 PM (14 years ago)
Author:
vboxsync
Message:

Makefiles: The PATH_<target> variable is deprated, use <target>_0_OUTDIR instead.

Location:
trunk/src/VBox
Files:
36 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/WINNT/Installer/Loader/Makefile.kmk

    r35046 r35380  
    4343
    4444 # The icon location is configurable.
    45  VBoxWindowsAdditions.rc_INCS += $(PATH_VBoxWindowsAdditions)
    46  VBoxWindowsAdditions.rc_DEPS += $(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc
    47  VBoxWindowsAdditions.rc_CLEAN = $(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc
     45 VBoxWindowsAdditions.rc_INCS += $(VBoxWindowsAdditions_0_OUTDIR)
     46 VBoxWindowsAdditions.rc_DEPS += $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
     47 VBoxWindowsAdditions.rc_CLEAN = $(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc
    4848
    4949
    5050 # Icon include file.
    51 $$(PATH_VBoxWindowsAdditions)/VBoxWindowsAdditions-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) Makefile.kmk | $$(dir $$@)
     51$$(VBoxWindowsAdditions_0_OUTDIR)/VBoxWindowsAdditions-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) Makefile.kmk | $$(dir $$@)
    5252        $(RM) -f $@
    5353        $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r35304 r35380  
    6666
    6767# The icon location is configurable.
    68 VBoxTray.rc_INCS = $(PATH_VBoxTray)
    69 VBoxTray.rc_DEPS = $(PATH_VBoxTray)/VBoxTray-icon.rc
    70 VBoxTray.rc_CLEAN = $(PATH_VBoxTray)/VBoxTray-icon.rc
     68VBoxTray.rc_INCS = $(VBoxTray_0_OUTDIR)
     69VBoxTray.rc_DEPS = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
     70VBoxTray.rc_CLEAN = $(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc
    7171
    7272# Icon include file.
    73 $$(PATH_VBoxTray)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@)
     73$$(VBoxTray_0_OUTDIR)/VBoxTray-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxTray_PATH)/Makefile.kmk | $$(dir $$@)
    7474        $(RM) -f $@
    7575        $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
  • trunk/src/VBox/Additions/WINNT/i8042prt/Makefile.kmk

    r28800 r35380  
    2424VBoxMouseNT_DEFS        = LOG_TO_BACKDOOR
    2525VBoxMouseNT_INCS        = \
    26         $(PATH_VBoxMouseNT) \
     26        $(VBoxMouseNT_0_OUTDIR) \
    2727        ./include \
    2828        ./i386
     
    4444        $(VBOX_LIB_IPRT_GUEST_R0_NT4)
    4545VBoxMouseNT_DEPS        = \
    46         $(PATH_VBoxMouseNT)/i8042log.rc
     46        $(VBoxMouseNT_0_OUTDIR)/i8042log.rc
    4747VBoxMouseNT_CLEAN       = \
    48         $(PATH_VBoxMouseNT)/i8042log.dbg \
    49         $(PATH_VBoxMouseNT)/i8042log.h \
    50         $(PATH_VBoxMouseNT)/i8042log.rc \
    51         $(PATH_VBoxMouseNT)/MSG00001.bin
     48        $(VBoxMouseNT_0_OUTDIR)/i8042log.dbg \
     49        $(VBoxMouseNT_0_OUTDIR)/i8042log.h \
     50        $(VBoxMouseNT_0_OUTDIR)/i8042log.rc \
     51        $(VBoxMouseNT_0_OUTDIR)/MSG00001.bin
    5252
    53 $$(PATH_VBoxMouseNT)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@)
     53$$(VBoxMouseNT_0_OUTDIR)/i8042log.rc: $(PATH_SUB_CURRENT)/i8042log.mc | $$(dir $$@)
    5454        $(call MSG_COMPILE,VBoxMouseNT,$<,$@,RC)
    5555        $(QUIET)$(WIN32_MC) \
    56                 -r $(PATH_VBoxMouseNT)/ \
    57                 -x $(PATH_VBoxMouseNT)/ \
    58                 -h $(PATH_VBoxMouseNT)/ \
     56                -r $(VBoxMouseNT_0_OUTDIR)/ \
     57                -x $(VBoxMouseNT_0_OUTDIR)/ \
     58                -h $(VBoxMouseNT_0_OUTDIR)/ \
    5959                $(subst /,\\,$<)
    6060endif # x86
  • trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

    r35319 r35380  
    5454VBoxGuestR0Lib_DEFS         = VBOX_WITH_HGCM
    5555VBoxGuestR0Lib_INCS         = \
    56         $(PATH_VBoxGuestR0Lib)
     56        $(VBoxGuestR0Lib_0_OUTDIR)
    5757VBoxGuestR0Lib_SOURCES      = \
    5858        GenericRequest.cpp \
  • trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

    r33257 r35380  
    141141# The icon is configurable.
    142142#
    143 VBoxService-win.rc_INCS = $(PATH_VBoxService)
    144 VBoxService-win.rc_DEPS = $(PATH_VBoxService)/VBoxService-win-icon.rc
    145 VBoxService-win.rc_CLEAN = $(PATH_VBoxService)/VBoxService-win-icon.rc
     143VBoxService-win.rc_INCS = $(VBoxService_0_OUTDIR)
     144VBoxService-win.rc_DEPS = $(VBoxService_0_OUTDIR)/VBoxService-win-icon.rc
     145VBoxService-win.rc_CLEAN = $(VBoxService_0_OUTDIR)/VBoxService-win-icon.rc
    146146
    147147# Icon include file.
    148 $$(PATH_VBoxService)/VBoxService-win-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxService_PATH)/Makefile.kmk | $$(dir $$@)
     148$$(VBoxService_0_OUTDIR)/VBoxService-win-icon.rc: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) $$(VBoxService_PATH)/Makefile.kmk | $$(dir $$@)
    149149        $(RM) -f $@
    150150        $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ADDITIONS_ICON_FILE))"'
  • trunk/src/VBox/Additions/freebsd/drm/Makefile.kmk

    r28800 r35380  
    4747vboxvideo_drm_DEPS         += $(VBOX_SVN_REV_KMK)
    4848vboxvideo_drm_INCS.freebsd  = \
    49         $(PATH_vboxvideo_drm) \
     49        $(vboxvideo_drm_0_OUTDIR) \
    5050        $(PATH_INS)/gen-sys-hdrs
    5151vboxvideo_drm_SOURCES       = vboxvideo_drm.c
     
    5757        $(PATH_INS)/gen-sys-hdrs/bus_if.h \
    5858        $(PATH_INS)/gen-sys-hdrs/device_if.h \
    59         $(PATH_vboxvideo_drm)/opt_drm.h
     59        $(vboxvideo_drm_0_OUTDIR)/opt_drm.h
    6060vboxvideo_drm_CLEAN.freebsd = $(vboxvideo_drm_DEPS)
    6161
     
    6363# Header for DRM not included by us.
    6464#
    65 $$(PATH_vboxvideo_drm)/opt_drm.h:
    66         $(QUIET)$(MKDIR) -p $(PATH_vboxvideo_drm)
    67         $(QUIET)touch $(PATH_vboxvideo_drm)/opt_drm.h
     65$$(vboxvideo_drm_0_OUTDIR)/opt_drm.h:
     66        $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR)
     67        $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_drm.h
    6868
    6969include $(KBUILD_PATH)/subfooter.kmk
  • trunk/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk

    r28800 r35380  
    3131vboxvfs_INCS          = \
    3232        . \
    33        $(PATH_vboxfs)
     33       $(vboxvfs_0_OUTDIR)
    3434vboxvfs_SOURCES       = \
    3535        vboxvfs_vfsops.c \
     
    3939        $(VBOX_LIB_IPRT_GUEST_R0)
    4040vboxvfs_DEPS          = \
    41        $$(PATH_vboxvfs)/vnode_if.h \
    42        $$(PATH_vboxvfs)/vnode_if_newproto.h \
    43        $$(PATH_vboxvfs)/vnode_if_typedef.h
     41       $$(vboxvfs_0_OUTDIR)/vnode_if.h \
     42       $$(vboxvfs_0_OUTDIR)/vnode_if_newproto.h \
     43       $$(vboxvfs_0_OUTDIR)/vnode_if_typedef.h
    4444vboxvfs_CLEAN        += $(vboxvfs_DEPS)
    4545
    4646VBOX_AWK := /usr/bin/awk
    4747
    48 $$(PATH_vboxvfs)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
     48$$(vboxvfs_0_OUTDIR)/vnode_if.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
    4949        $(call MSG_TOOL,awk,VBoxGuest,$<,$@)
    5050        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -h
    51         $(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if.h $(PATH_vboxvfs)/vnode_if.h
     51        $(QUIET)$(MV) $(vboxvfs_0_OUTDIR)/vnode_if.h $(vboxvfs_0_OUTDIR)/vnode_if.h
    5252
    53 $$(PATH_vboxvfs)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
     53$$(vboxvfs_0_OUTDIR)/vnode_if_newproto.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
    5454        $(call MSG_TOOL,awk,VBoxGuest,$<,$@)
    5555        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -p
    56         $(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_newproto.h $(PATH_vboxvfs)/vnode_if_newproto.h
     56        $(QUIET)$(MV) $(vboxvfs_0_OUTDIR)/vnode_if_newproto.h $(vboxvfs_0_OUTDIR)/vnode_if_newproto.h
    5757
    58 $$(PATH_vboxvfs)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
     58$$(vboxvfs_0_OUTDIR)/vnode_if_typedef.h: $(VBOX_FREEBSD_SRC)/kern/vnode_if.src
    5959        $(call MSG_TOOL,awk,VBoxGuest,$<,$@)
    6060        $(QUIET)$(VBOX_AWK) -f $(VBOX_FREEBSD_SRC)/tools/vnode_if.awk $(VBOX_FREEBSD_SRC)/kern/vnode_if.src -q
    61         $(QUIET)$(MV) $(PATH_vboxvfs)/vnode_if_typedef.h $(PATH_vboxvfs)/vnode_if_typedef.h
     61        $(QUIET)$(MV) $(vboxvfs_0_OUTDIR)/vnode_if_typedef.h $(vboxvfs_0_OUTDIR)/vnode_if_typedef.h
    6262
    6363include $(KBUILD_PATH)/subfooter.kmk
  • trunk/src/VBox/Additions/linux/drm/Makefile.kmk

    r32183 r35380  
    3939vboxvideo_drm-sh_SOURCES     = $(subst ",,$(FILES_VBOXVIDEO_DRM_BIN))
    4040vboxvideo_drm-sh_SOURCES    += \
    41         $(PATH_vboxvideo_drm-sh)/build_in_tmp \
     41        $(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp \
    4242        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    43 vboxvideo_drm-sh_CLEAN      += $(PATH_vboxvideo_drm-sh)/build_in_tmp
     43vboxvideo_drm-sh_CLEAN      += $(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp
    4444
    4545
     
    7272## Scripts needed for building kernel modules
    7373
    74 $$(PATH_vboxvideo_drm-sh)/build_in_tmp: \
     74$$(vboxvideo_drm-sh_0_OUTDIR)/build_in_tmp: \
    7575                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    7676                $(VBOX_VERSION_STAMP) \
  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

    r33439 r35380  
    3838vboxsf-sh_SOURCES     = $(subst ",,$(FILES_VBOXSF_BIN))
    3939vboxsf-sh_SOURCES    += \
    40         $(PATH_vboxsf-sh)/build_in_tmp \
     40        $(vboxsf-sh_0_OUTDIR)/build_in_tmp \
    4141        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    42 vboxsf-sh_CLEAN      += $(PATH_vboxsf-sh)/build_in_tmp
     42vboxsf-sh_CLEAN      += $(vboxsf-sh_0_OUTDIR)/build_in_tmp
    4343
    4444
     
    9090## Scripts needed for building kernel modules
    9191
    92 $$(PATH_vboxsf-sh)/build_in_tmp: \
     92$$(vboxsf-sh_0_OUTDIR)/build_in_tmp: \
    9393                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    9494                $(VBOX_VERSION_STAMP) \
  • trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

    r33540 r35380  
    7676# Actually, this is darn annoying and will *NOT* be tolerated for any new code!
    7777#
    78 VBoxClient_LIBPATH  += $(PATH_VBoxClient)
    79 VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
    80 VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
    81 $$(PATH_VBoxClient)/libstdc++.a:
     78VBoxClient_LIBPATH  += $(VBoxClient_0_OUTDIR)
     79VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a
     80VBoxClient_CLEAN     = $(VBoxClient_0_OUTDIR)/libstdc++.a
     81$$(VBoxClient_0_OUTDIR)/libstdc++.a:
    8282        $(call MSG_L1,Forcing static libstdc++)
    8383        $(QUIET)$(MKDIR) -p $(@D)
     
    9191# Set this in LocalConfig.kmk if you are working on the X11 clipboard service
    9292# to automatically run the unit test at build time.
    93 #       OTHERS += $(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto.run
     93#       OTHERS += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run
    9494
    9595   PROGRAMS += tstSeamlessX11-auto
     
    102102           $(LIB_RUNTIME)
    103103
    104    TESTING  += $(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto
    105 $$(PATH_tstSeamlessX11-auto)/tstSeamlessX11-auto.run: \
     104   TESTING  += $(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto
     105$$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
    106106        $$(INSTARGET_tstSeamlessX11-auto)
    107107        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstSeamlessX11-auto) quiet
  • trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

    r33540 r35380  
    222222   ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
    223223    ifndef VBOX_ONLY_SDK
    224      OUR_PATH_VBOXMOUSE=$(PATH_ROOT)/src/VBox/Additions/x11/vboxmouse
    225 
    226     ifeq ($(KBUILD_TARGET),linux)
    227       TESTING  += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
    228       OTHERS += $(PATH_vboxmouse_drv)/tstvboxmouse68.run
    229 $$(PATH_vboxmouse_drv)/tstvboxmouse68.run: $$(INSTARGET_vboxmouse_drv)
     224     VBOXMOUSE_SRC_PATH := $(PATH_SUB_CURRENT)
     225
     226     ifeq ($(KBUILD_TARGET),linux)
     227      TESTING += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
     228      OTHERS += $(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run
     229$$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(INSTARGET_vboxmouse_drv)
    230230        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    231231        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
    232             "$(INSTARGET_vboxmouse_drv)" "$(OUR_PATH_VBOXMOUSE)/undefined_68" --static
    233         $(QUIET)$(APPEND) -t "$@" "done"
    234     endif
    235 
    236      TESTING  += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
    237      OTHERS += $(PATH_vboxmouse_drv_70)/tstvboxmouse70.run
    238 $$(PATH_vboxmouse_drv_70)/tstvboxmouse70.run: $$(INSTARGET_vboxmouse_drv_70)
     232            "$(INSTARGET_vboxmouse_drv)" "$(VBOXMOUSE_SRC_PATH)/undefined_68" --static
     233        $(QUIET)$(APPEND) -t "$@" "done"
     234     endif
     235
     236     TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
     237     OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
     238$$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(INSTARGET_vboxmouse_drv_70)
    239239        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    240240        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh  $(KBUILD_TARGET) \
    241             $(INSTARGET_vboxmouse_drv_70) $(OUR_PATH_VBOXMOUSE)/undefined_70
    242         $(QUIET)$(APPEND) -t "$@" "done"
    243 
    244      TESTING  += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
    245      OTHERS += $(PATH_vboxmouse_drv_71)/tstvboxmouse71.run
    246 $$(PATH_vboxmouse_drv_71)/tstvboxmouse71.run: $$(INSTARGET_vboxmouse_drv_71)
    247         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    248         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    249             $(INSTARGET_vboxmouse_drv_71) $(OUR_PATH_VBOXMOUSE)/undefined_71
    250         $(QUIET)$(APPEND) -t "$@" "done"
    251 
    252      TESTING  += $(PATH_vboxmouse_drv_13)/tstvboxmouse13.run
    253      OTHERS += $(PATH_vboxmouse_drv_13)/tstvboxmouse13.run
    254 $$(PATH_vboxmouse_drv_13)/tstvboxmouse13.run: $$(INSTARGET_vboxmouse_drv_13)
     241            $(INSTARGET_vboxmouse_drv_70) $(VBOXMOUSE_SRC_PATH)/undefined_70
     242        $(QUIET)$(APPEND) -t "$@" "done"
     243
     244     TESTING += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run
     245     OTHERS += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run
     246$$(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run: $$(INSTARGET_vboxmouse_drv_71)
     247        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     248        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     249            $(INSTARGET_vboxmouse_drv_71) $(VBOXMOUSE_SRC_PATH)/undefined_71
     250        $(QUIET)$(APPEND) -t "$@" "done"
     251
     252     TESTING += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run
     253     OTHERS += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run
     254$$(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run: $$(INSTARGET_vboxmouse_drv_13)
    255255        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    256256        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
    257             $(INSTARGET_vboxmouse_drv_13) $(OUR_PATH_VBOXMOUSE)/undefined_15
    258         $(QUIET)$(APPEND) -t "$@" "done"
    259 
    260      TESTING  += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
    261      OTHERS += $(PATH_vboxmouse_drv_14)/tstvboxmouse14.run
    262 $$(PATH_vboxmouse_drv_14)/tstvboxmouse14.run: $$(INSTARGET_vboxmouse_drv_14)
     257            $(INSTARGET_vboxmouse_drv_13) $(VBOXMOUSE_SRC_PATH)/undefined_15
     258        $(QUIET)$(APPEND) -t "$@" "done"
     259
     260     TESTING += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run
     261     OTHERS += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run
     262$$(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run: $$(INSTARGET_vboxmouse_drv_14)
    263263        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    264264        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET) \
    265             $(INSTARGET_vboxmouse_drv_14) $(OUR_PATH_VBOXMOUSE)/undefined_15
    266         $(QUIET)$(APPEND) -t "$@" "done"
    267 
    268      TESTING  += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
    269      OTHERS += $(PATH_vboxmouse_drv_15)/tstvboxmouse15.run
    270 $$(PATH_vboxmouse_drv_15)/tstvboxmouse15.run: $$(INSTARGET_vboxmouse_drv_15)
    271         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    272         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    273             $(INSTARGET_vboxmouse_drv_15) $(OUR_PATH_VBOXMOUSE)/undefined_15
    274         $(QUIET)$(APPEND) -t "$@" "done"
    275 
    276      TESTING  += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
    277      OTHERS += $(PATH_vboxmouse_drv_16)/tstvboxmouse16.run
    278 $$(PATH_vboxmouse_drv_16)/tstvboxmouse16.run: $$(INSTARGET_vboxmouse_drv_16)
    279         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    280         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    281             $(INSTARGET_vboxmouse_drv_16) $(OUR_PATH_VBOXMOUSE)/undefined_15
    282         $(QUIET)$(APPEND) -t "$@" "done"
    283 
    284      TESTING  += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
    285      OTHERS += $(PATH_vboxmouse_drv_17)/tstvboxmouse17.run
    286 $$(PATH_vboxmouse_drv_17)/tstvboxmouse17.run: $$(INSTARGET_vboxmouse_drv_17)
    287         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    288         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    289             $(INSTARGET_vboxmouse_drv_17) $(OUR_PATH_VBOXMOUSE)/undefined_15
    290         $(QUIET)$(APPEND) -t "$@" "done"
    291 
    292      TESTING  += $(PATH_vboxmouse_drv_18)/tstvboxmouse18.run
    293      OTHERS += $(PATH_vboxmouse_drv_18)/tstvboxmouse18.run
    294 $$(PATH_vboxmouse_drv_18)/tstvboxmouse18.run: $$(INSTARGET_vboxmouse_drv_18)
    295         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    296         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    297             $(INSTARGET_vboxmouse_drv_18) $(OUR_PATH_VBOXMOUSE)/undefined_15
    298         $(QUIET)$(APPEND) -t "$@" "done"
    299 
    300      TESTING  += $(PATH_vboxmouse_drv_19)/tstvboxmouse19.run
    301      OTHERS += $(PATH_vboxmouse_drv_19)/tstvboxmouse19.run
    302 $$(PATH_vboxmouse_drv_19)/tstvboxmouse19.run: $$(INSTARGET_vboxmouse_drv_19)
    303         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    304         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    305             $(INSTARGET_vboxmouse_drv_19) $(OUR_PATH_VBOXMOUSE)/undefined_15
     265            $(INSTARGET_vboxmouse_drv_14) $(VBOXMOUSE_SRC_PATH)/undefined_15
     266        $(QUIET)$(APPEND) -t "$@" "done"
     267
     268     TESTING += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run
     269     OTHERS += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run
     270$$(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run: $$(INSTARGET_vboxmouse_drv_15)
     271        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     272        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     273            $(INSTARGET_vboxmouse_drv_15) $(VBOXMOUSE_SRC_PATH)/undefined_15
     274        $(QUIET)$(APPEND) -t "$@" "done"
     275
     276     TESTING += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run
     277     OTHERS += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run
     278$$(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run: $$(INSTARGET_vboxmouse_drv_16)
     279        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     280        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     281            $(INSTARGET_vboxmouse_drv_16) $(VBOXMOUSE_SRC_PATH)/undefined_15
     282        $(QUIET)$(APPEND) -t "$@" "done"
     283
     284     TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
     285     OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
     286$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(INSTARGET_vboxmouse_drv_17)
     287        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     288        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     289            $(INSTARGET_vboxmouse_drv_17) $(VBOXMOUSE_SRC_PATH)/undefined_15
     290        $(QUIET)$(APPEND) -t "$@" "done"
     291
     292     TESTING += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run
     293     OTHERS += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run
     294$$(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run: $$(INSTARGET_vboxmouse_drv_18)
     295        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     296        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     297            $(INSTARGET_vboxmouse_drv_18) $(VBOXMOUSE_SRC_PATH)/undefined_15
     298        $(QUIET)$(APPEND) -t "$@" "done"
     299
     300     TESTING += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run
     301     OTHERS += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run
     302$$(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run: $$(INSTARGET_vboxmouse_drv_19)
     303        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     304        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     305            $(INSTARGET_vboxmouse_drv_19) $(VBOXMOUSE_SRC_PATH)/undefined_15
    306306        $(QUIET)$(APPEND) -t "$@" "done"
    307307
     
    313313
    314314include $(KBUILD_PATH)/subfooter.kmk
     315
  • trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    r34997 r35380  
    298298   ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
    299299    ifndef VBOX_ONLY_SDK
    300      OUR_PATH_VBOXVIDEO=$(PATH_ROOT)/src/VBox/Additions/x11/vboxvideo
     300     VBOXVIDEO_SRC_PATH := $(PATH_SUB_CURRENT)
    301301
    302302     ifeq ($(KBUILD_TARGET),linux)
    303      TESTING  += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
    304      OTHERS += $(PATH_vboxvideo_drv)/tstvboxvideo68.run
    305 $$(PATH_vboxvideo_drv)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
    306         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    307         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    308             $(INSTARGET_vboxvideo_drv) $(OUR_PATH_VBOXVIDEO)/undefined_68 --static
     303      TESTING += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
     304      OTHERS += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run
     305$$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(INSTARGET_vboxvideo_drv)
     306        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     307        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     308            $(INSTARGET_vboxvideo_drv) $(VBOXVIDEO_SRC_PATH)/undefined_68 --static
    309309        $(QUIET)$(APPEND) -t "$@" "done"
    310310     endif
    311311
    312      TESTING  += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
    313      OTHERS += $(PATH_vboxvideo_drv_70)/tstvboxvideo70.run
    314 $$(PATH_vboxvideo_drv_70)/tstvboxvideo70.run: $$(INSTARGET_vboxvideo_drv_70)
    315         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    316         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    317             $(INSTARGET_vboxvideo_drv_70) $(OUR_PATH_VBOXVIDEO)/undefined_70
    318         $(QUIET)$(APPEND) -t "$@" "done"
    319 
    320      TESTING  += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
    321      OTHERS += $(PATH_vboxvideo_drv_71)/tstvboxvideo71.run
    322 $$(PATH_vboxvideo_drv_71)/tstvboxvideo71.run: $$(INSTARGET_vboxvideo_drv_71)
    323         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    324         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    325             $(INSTARGET_vboxvideo_drv_71) $(OUR_PATH_VBOXVIDEO)/undefined_70
    326         $(QUIET)$(APPEND) -t "$@" "done"
    327 
    328      TESTING  += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
    329      OTHERS += $(PATH_vboxvideo_drv_13)/tstvboxvideo13.run
    330 $$(PATH_vboxvideo_drv_13)/tstvboxvideo13.run: $$(INSTARGET_vboxvideo_drv_13)
    331         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    332         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    333             $(INSTARGET_vboxvideo_drv_13) $(OUR_PATH_VBOXVIDEO)/undefined_13
    334         $(QUIET)$(APPEND) -t "$@" "done"
    335 
    336      TESTING  += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
    337      OTHERS += $(PATH_vboxvideo_drv_14)/tstvboxvideo14.run
    338 $$(PATH_vboxvideo_drv_14)/tstvboxvideo14.run: $$(INSTARGET_vboxvideo_drv_14)
    339         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    340         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    341             $(INSTARGET_vboxvideo_drv_14) $(OUR_PATH_VBOXVIDEO)/undefined_13
    342         $(QUIET)$(APPEND) -t "$@" "done"
    343 
    344      TESTING  += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
    345      OTHERS += $(PATH_vboxvideo_drv_15)/tstvboxvideo15.run
    346 $$(PATH_vboxvideo_drv_15)/tstvboxvideo15.run: $$(INSTARGET_vboxvideo_drv_15)
    347         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    348         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    349             $(INSTARGET_vboxvideo_drv_15) $(OUR_PATH_VBOXVIDEO)/undefined_13
    350         $(QUIET)$(APPEND) -t "$@" "done"
    351 
    352      TESTING  += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
    353      OTHERS += $(PATH_vboxvideo_drv_16)/tstvboxvideo16.run
    354 $$(PATH_vboxvideo_drv_16)/tstvboxvideo16.run: $$(INSTARGET_vboxvideo_drv_16)
    355         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    356         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    357             $(INSTARGET_vboxvideo_drv_16) $(OUR_PATH_VBOXVIDEO)/undefined_13
    358         $(QUIET)$(APPEND) -t "$@" "done"
    359 
    360      TESTING  += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
    361      OTHERS += $(PATH_vboxvideo_drv_17)/tstvboxvideo17.run
    362 $$(PATH_vboxvideo_drv_17)/tstvboxvideo17.run: $$(INSTARGET_vboxvideo_drv_17)
    363         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    364         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    365             $(INSTARGET_vboxvideo_drv_17) $(OUR_PATH_VBOXVIDEO)/undefined_13
    366         $(QUIET)$(APPEND) -t "$@" "done"
    367 
    368      TESTING  += $(PATH_vboxvideo_drv_18)/tstvboxvideo18.run
    369      OTHERS += $(PATH_vboxvideo_drv_18)/tstvboxvideo18.run
    370 $$(PATH_vboxvideo_drv_18)/tstvboxvideo18.run: $$(INSTARGET_vboxvideo_drv_18)
    371         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    372         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    373             $(INSTARGET_vboxvideo_drv_18) $(OUR_PATH_VBOXVIDEO)/undefined_13
    374         $(QUIET)$(APPEND) -t "$@" "done"
    375 
    376      TESTING  += $(PATH_vboxvideo_drv_19)/tstvboxvideo19.run
    377      OTHERS += $(PATH_vboxvideo_drv_19)/tstvboxvideo19.run
    378 $$(PATH_vboxvideo_drv_19)/tstvboxvideo19.run: $$(INSTARGET_vboxvideo_drv_19)
    379         $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
    380         $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
    381             $(INSTARGET_vboxvideo_drv_19) $(OUR_PATH_VBOXVIDEO)/undefined_13
     312     TESTING += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run
     313     OTHERS += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run
     314$$(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run: $$(INSTARGET_vboxvideo_drv_70)
     315        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     316        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     317            $(INSTARGET_vboxvideo_drv_70) $(VBOXVIDEO_SRC_PATH)/undefined_70
     318        $(QUIET)$(APPEND) -t "$@" "done"
     319
     320     TESTING += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run
     321     OTHERS += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run
     322$$(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run: $$(INSTARGET_vboxvideo_drv_71)
     323        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     324        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     325            $(INSTARGET_vboxvideo_drv_71) $(VBOXVIDEO_SRC_PATH)/undefined_70
     326        $(QUIET)$(APPEND) -t "$@" "done"
     327
     328     TESTING += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run
     329     OTHERS += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run
     330$$(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run: $$(INSTARGET_vboxvideo_drv_13)
     331        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     332        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     333            $(INSTARGET_vboxvideo_drv_13) $(VBOXVIDEO_SRC_PATH)/undefined_13
     334        $(QUIET)$(APPEND) -t "$@" "done"
     335
     336     TESTING += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run
     337     OTHERS += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run
     338$$(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run: $$(INSTARGET_vboxvideo_drv_14)
     339        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     340        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     341            $(INSTARGET_vboxvideo_drv_14) $(VBOXVIDEO_SRC_PATH)/undefined_13
     342        $(QUIET)$(APPEND) -t "$@" "done"
     343
     344     TESTING += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run
     345     OTHERS += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run
     346$$(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run: $$(INSTARGET_vboxvideo_drv_15)
     347        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     348        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     349            $(INSTARGET_vboxvideo_drv_15) $(VBOXVIDEO_SRC_PATH)/undefined_13
     350        $(QUIET)$(APPEND) -t "$@" "done"
     351
     352     TESTING += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run
     353     OTHERS += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run
     354$$(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run: $$(INSTARGET_vboxvideo_drv_16)
     355        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     356        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     357            $(INSTARGET_vboxvideo_drv_16) $(VBOXVIDEO_SRC_PATH)/undefined_13
     358        $(QUIET)$(APPEND) -t "$@" "done"
     359
     360     TESTING += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run
     361     OTHERS += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run
     362$$(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run: $$(INSTARGET_vboxvideo_drv_17)
     363        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     364        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     365            $(INSTARGET_vboxvideo_drv_17) $(VBOXVIDEO_SRC_PATH)/undefined_13
     366        $(QUIET)$(APPEND) -t "$@" "done"
     367
     368     TESTING += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run
     369     OTHERS += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run
     370$$(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run: $$(INSTARGET_vboxvideo_drv_18)
     371        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     372        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     373            $(INSTARGET_vboxvideo_drv_18) $(VBOXVIDEO_SRC_PATH)/undefined_13
     374        $(QUIET)$(APPEND) -t "$@" "done"
     375
     376     TESTING += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run
     377     OTHERS += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run
     378$$(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run: $$(INSTARGET_vboxvideo_drv_19)
     379        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
     380        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
     381            $(INSTARGET_vboxvideo_drv_19) $(VBOXVIDEO_SRC_PATH)/undefined_13
    382382        $(QUIET)$(APPEND) -t "$@" "done"
    383383
  • trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

    r34399 r35380  
    3838VgaBiosBin_DEFS     = IN_VBOXDD2
    3939VgaBiosBin_INCS     = $(VBOX_PATH_DEVICES_SRC)
    40 VgaBiosBin_SOURCES  = $(PATH_VgaBiosBin)/VgaBiosBin.c
     40VgaBiosBin_SOURCES  = $(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c
    4141VgaBiosBin_CLEAN    = \
    42         $(PATH_VgaBiosBin)/vbetables.h \
     42        $(VgaBiosBin_0_OUTDIR)/vbetables.h \
    4343        \
    44         $(PATH_VgaBiosBin)/_vgabios_.c \
    45         $(PATH_VgaBiosBin)/vgabios0.s \
    46         $(PATH_VgaBiosBin)/vgabios1.s \
    47         $(PATH_VgaBiosBin)/vgabios.tmp \
    48         $(PATH_VgaBiosBin)/vgabios.lst \
    49         $(PATH_VgaBiosBin)/vgabios.bin \
    50         $(PATH_VgaBiosBin)/VgaBiosBin.c \
    51         $(PATH_VgaBiosBin)/VgaDefBiosLogo.c \
     44        $(VgaBiosBin_0_OUTDIR)/_vgabios_.c \
     45        $(VgaBiosBin_0_OUTDIR)/vgabios0.s \
     46        $(VgaBiosBin_0_OUTDIR)/vgabios1.s \
     47        $(VgaBiosBin_0_OUTDIR)/vgabios.tmp \
     48        $(VgaBiosBin_0_OUTDIR)/vgabios.lst \
     49        $(VgaBiosBin_0_OUTDIR)/vgabios.bin \
     50        $(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c \
     51        $(VgaBiosBin_0_OUTDIR)/VgaDefBiosLogo.c \
    5252        \
    53         $(PATH_VgaBiosBin)/_vgabios-cirrus_.c \
    54         $(PATH_VgaBiosBin)/vgabios-cirrus0.s \
    55         $(PATH_VgaBiosBin)/vgabios-cirrus1.s \
    56         $(PATH_VgaBiosBin)/vgabios-cirrus.tmp \
    57         $(PATH_VgaBiosBin)/vgabios-cirrus.lst \
    58         $(PATH_VgaBiosBin)/vgabios-cirrus.bin
     53        $(VgaBiosBin_0_OUTDIR)/_vgabios-cirrus_.c \
     54        $(VgaBiosBin_0_OUTDIR)/vgabios-cirrus0.s \
     55        $(VgaBiosBin_0_OUTDIR)/vgabios-cirrus1.s \
     56        $(VgaBiosBin_0_OUTDIR)/vgabios-cirrus.tmp \
     57        $(VgaBiosBin_0_OUTDIR)/vgabios-cirrus.lst \
     58        $(VgaBiosBin_0_OUTDIR)/vgabios-cirrus.bin
    5959
    6060#
    6161# Rule for making the bios.
    6262#
    63 $$(PATH_VgaBiosBin)/VgaBiosBin.c: $$(PATH_VgaBiosBin)/vgabios.bin $(VBOX_BIN2C)
     63$$(VgaBiosBin_0_OUTDIR)/VgaBiosBin.c: $$(VgaBiosBin_0_OUTDIR)/vgabios.bin $(VBOX_BIN2C)
    6464        $(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
    6565        $(QUIET)$(VBOX_BIN2C) -min 36 -max 36 -mask 0x0fff -ascii -export VgaBiosBinary $< $@
     
    7070
    7171# 1. create vbetables.h
    72 $$(PATH_VgaBiosBin)/vbetables.h: $(MAKEFILE_CURRENT) $$(TARGET_vbetables-gen) | $$(dir $$@)
     72$$(VgaBiosBin_0_OUTDIR)/vbetables.h: $(MAKEFILE_CURRENT) $$(TARGET_vbetables-gen) | $$(dir $$@)
    7373        $(QUIET)$(REDIRECT) -wo $@ -- $(TARGET_vbetables-gen)
    7474
    7575# 2. precompile
    7676# WARNING! DEBUG is undefined here to keep the image size stable between debug and release builds.
    77 $$(PATH_VgaBiosBin)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $$(PATH_VgaBiosBin)/vbetables.h $(PATH_ROOT)/include/VBox/Hardware/VBoxVideoVBE.h $(VBOX_VERSION_STAMP)
     77$$(VgaBiosBin_0_OUTDIR)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $$(VgaBiosBin_0_OUTDIR)/vbetables.h $(PATH_ROOT)/include/VBox/Hardware/VBoxVideoVBE.h $(VBOX_VERSION_STAMP)
    7878        $(call MSG_TOOL,cpp,VgaBiosBin,$<,$@)
    7979        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P \
     
    8686# 3. compile
    8787# BCC tempfile clashes, order the BCC jobs to make sure they don't interfere with one another.
    88 $$(PATH_VgaBiosBin)/vgabios0.s: $$(PATH_VgaBiosBin)/_vgabios_.c | $(VBOX_BCC_JOBS)
     88$$(VgaBiosBin_0_OUTDIR)/vgabios0.s: $$(VgaBiosBin_0_OUTDIR)/_vgabios_.c | $(VBOX_BCC_JOBS)
    8989        $(call MSG_COMPILE,VgaBiosBin,$<,$@,C)
    9090        $(QUIET)$(VBOX_BCC) -o $@ -C-c -D__i86__ -0 -S $^
    91 VBOX_BCC_JOBS += $(PATH_VgaBiosBin)/vgabios0.s
     91VBOX_BCC_JOBS += $(VgaBiosBin_0_OUTDIR)/vgabios0.s
    9292
    9393# 4. preprocess intermediate assembly.
    94 $$(PATH_VgaBiosBin)/vgabios1.s: $$(PATH_VgaBiosBin)/vgabios0.s
     94$$(VgaBiosBin_0_OUTDIR)/vgabios1.s: $$(VgaBiosBin_0_OUTDIR)/vgabios0.s
    9595        $(call MSG_TOOL,Adjusting BCC Assembly,VgaBiosBin,$<,$@)
    9696        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
    9797
    9898# 5. assemble
    99 $$(PATH_VgaBiosBin)/vgabios.tmp $$(PATH_VgaBiosBin)/vgabios.lst: $$(PATH_VgaBiosBin)/vgabios1.s
     99$$(VgaBiosBin_0_OUTDIR)/vgabios.tmp $$(VgaBiosBin_0_OUTDIR)/vgabios.lst: $$(VgaBiosBin_0_OUTDIR)/vgabios1.s
    100100        $(call MSG_COMPILE,VgaBiosBin,$<,$@,AS)
    101         $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_VgaBiosBin)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_VgaBiosBin)/vgabios.lst
     101        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(VgaBiosBin_0_OUTDIR)/vgabios.tmp -u- -w- -g -0 -j -O -l $(VgaBiosBin_0_OUTDIR)/vgabios.lst
    102102
    103103# 6. checksums
    104 $$(PATH_VgaBiosBin)/vgabios.bin: $$(PATH_VgaBiosBin)/vgabios.tmp $$(VBOX_BIOSSUMS)
     104$$(VgaBiosBin_0_OUTDIR)/vgabios.bin: $$(VgaBiosBin_0_OUTDIR)/vgabios.tmp $$(VBOX_BIOSSUMS)
    105105        $(call MSG_TOOL,biossums,VgaBiosBin,$<,$@)
    106106        $(QUIET)$(VBOX_BIOSSUMS) $< $@
     
    112112VgaDefBiosLogo_TEMPLATE  = VBOXR3
    113113VgaDefBiosLogo_INCS      = $(VBOX_PATH_DEVICES_SRC)
    114 VgaDefBiosLogo_SOURCES   = $(PATH_VgaBiosBin)/VgaDefBiosLogo.c
     114VgaDefBiosLogo_SOURCES   = $(VgaBiosBin_0_OUTDIR)/VgaDefBiosLogo.c
    115115
    116116#
    117117# Rule for making the bios logo.
    118118#
    119 $$(PATH_VgaBiosBin)/VgaDefBiosLogo.c: $(VBOX_BRAND_BIOS_LOGO) $(VBOX_BIN2C)
     119$$(VgaBiosBin_0_OUTDIR)/VgaDefBiosLogo.c: $(VBOX_BRAND_BIOS_LOGO) $(VBOX_BIN2C)
    120120        $(call MSG_TOOL,bin2c,VgaBiosBin,$<,$@)
    121121        $(QUIET)$(VBOX_BIN2C) VgaDefBiosLogo $< $@
  • trunk/src/VBox/Devices/Makefile.kmk

    r35358 r35380  
    441441
    442442 ifdef VBOX_WITH_DTRACE_R3
    443   DevicesR3_DEFS        += VBOX_WITH_DTRACE
    444   DevicesR3_INCS        += $(DevicesR3_0_OUTDIR)
     443  DevicesR3_DEFS          += VBOX_WITH_DTRACE
     444  DevicesR3_INCS          += $(DevicesR3_0_OUTDIR)
    445445  DevicesR3_INTERMEDIATES += $(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h
    446446  $$(DevicesR3_0_OUTDIR)/VBoxDD-dtrace.h: $(PATH_SUB_CURRENT)/build/VBoxDD-dtrace.d | $$(dir $$@)
     
    449449
    450450 ifdef VBOX_WITH_DYNAMIC_DSDT
    451   DevicesR3_CLEAN       += $(PATH_DevicesR3)/vboxdsl.hex
    452   PC/ACPI/VBoxAcpi.cpp_DEPS = $(PATH_DevicesR3)/vboxdsl.hex
    453 
    454   $$(PATH_DevicesR3)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
     451  DevicesR3_CLEAN          += $(DevicesR3_0_OUTDIR)/vboxdsl.hex
     452  PC/ACPI/VBoxAcpi.cpp_DEPS = $(DevicesR3_0_OUTDIR)/vboxdsl.hex
     453
     454  $$(DevicesR3_0_OUTDIR)/vboxdsl.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
    455455        $(call MSG_TOOL,bin2c,DevicesR3,$<,$@)
    456456        $(QUIET)$(VBOX_BIN2C) -export VboxDslSource $< $@
    457457
    458   vboxdsl.hex:: $$(PATH_DevicesR3)/vboxdsl.hex
     458  vboxdsl.hex:: $$(DevicesR3_0_OUTDIR)/vboxdsl.hex
    459459
    460460 else  # !VBOX_WITH_DYNAMIC_DSDT
    461461  # VBoxAcpi.cpp needs vboxaml.hex which we generate from PC/vbox.dsl
    462462  DevicesR3_CLEAN       += \
    463         $(PATH_DevicesR3)/vboxaml.hex \
    464         $(PATH_DevicesR3)/vboxaml.aml \
    465         $(PATH_DevicesR3)/vboxssdt-standard.hex \
    466         $(PATH_DevicesR3)/vboxssdt-standard.aml \
    467         $(PATH_DevicesR3)/vboxssdt-standard.aml.tmp \
    468         $(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex \
    469         $(PATH_DevicesR3)/vboxssdt-cpuhotplug.aml \
    470         $(PATH_DevicesR3)/vboxssdt-cpuhotplug.aml.tmp \
    471         $(PATH_DevicesR3)/vboxssdt-cpuhotplug.aml.pre
     463        $(DevicesR3_0_OUTDIR)/vboxaml.hex \
     464        $(DevicesR3_0_OUTDIR)/vboxaml.aml \
     465        $(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex \
     466        $(DevicesR3_0_OUTDIR)/vboxssdt-standard.aml \
     467        $(DevicesR3_0_OUTDIR)/vboxssdt-standard.aml.tmp \
     468        $(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex \
     469        $(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.aml \
     470        $(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.aml.tmp \
     471        $(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.aml.pre
    472472  PC/ACPI/VBoxAcpi.cpp_DEPS = \
    473         $(PATH_DevicesR3)/vboxaml.hex \
    474         $(PATH_DevicesR3)/vboxssdt-standard.hex \
    475         $(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex
    476 
    477   $$(PATH_DevicesR3)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
     473        $(DevicesR3_0_OUTDIR)/vboxaml.hex \
     474        $(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex \
     475        $(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex
     476
     477  $$(DevicesR3_0_OUTDIR)/vboxaml.hex: $(PATH_SUB_CURRENT)/PC/vbox.dsl | $$(dir $$@)
    478478        $(call MSG_TOOL,iasl,DevicesR3,$<,$@)
    479479        $(QUIET)$(VBOX_IASLCMD) -tc -vs -p $@ $<
    480480
    481   vboxaml.hex:: $$(PATH_DevicesR3)/vboxaml.hex
    482 
    483   $$(PATH_DevicesR3)/vboxssdt-standard.hex: $(PATH_SUB_CURRENT)/PC/vbox-standard.dsl | $$(dir $$@)
     481  vboxaml.hex:: $$(DevicesR3_0_OUTDIR)/vboxaml.hex
     482
     483  $$(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex: $(PATH_SUB_CURRENT)/PC/vbox-standard.dsl | $$(dir $$@)
    484484        $(call MSG_TOOL,iasl,DevicesR3,$<,$@)
    485485        $(QUIET)$(RM) -f $@ [email protected]
     
    491491
    492492
    493   vboxssdt-standard.hex:: $$(PATH_DevicesR3)/vboxssdt-standard.hex
    494 
    495   $$(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex: $(PATH_SUB_CURRENT)/PC/vbox-cpuhotplug.dsl | $$(dir $$@)
     493  vboxssdt-standard.hex:: $$(DevicesR3_0_OUTDIR)/vboxssdt-standard.hex
     494
     495  $$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex: $(PATH_SUB_CURRENT)/PC/vbox-cpuhotplug.dsl | $$(dir $$@)
    496496        $(call MSG_TOOL,iasl,DevicesR3,$<,$@)
    497497        $(QUIET)$(RM) -f $@ [email protected] [email protected]
     
    504504
    505505
    506   vboxssdt-cpuhotplug.hex:: $$(PATH_DevicesR3)/vboxssdt-cpuhotplug.hex
     506  vboxssdt-cpuhotplug.hex:: $$(DevicesR3_0_OUTDIR)/vboxssdt-cpuhotplug.hex
    507507
    508508 endif # !VBOX_WITH_DYNAMIC_DSDT
    509  PC/ACPI/VBoxAcpi.cpp_INCS = $(PATH_DevicesR3)
     509 PC/ACPI/VBoxAcpi.cpp_INCS = $(DevicesR3_0_OUTDIR)
    510510
    511511 # For finding PCIInternal.h from VBox/pci.h.
     
    516516
    517517 # For finding and generating vbetables.h (see Graphics/BIOS/Makefile.kmk).
    518  Graphics/DevVGA.cpp_INCS = $(PATH_VgaBiosBin)
    519  Graphics/DevVGA.cpp_DEPS = $(PATH_VgaBiosBin)/vbetables.h
     518 Graphics/DevVGA.cpp_INCS = $(VgaBiosBin_0_OUTDIR)
     519 Graphics/DevVGA.cpp_DEPS = $(VgaBiosBin_0_OUTDIR)/vbetables.h
    520520
    521521
  • trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

    r28800 r35380  
    3131PcBiosBin_DEFS      = IN_VBOXDD2
    3232PcBiosBin_INCS      = $(VBOX_PATH_DEVICES_SRC)
    33 PcBiosBin_SOURCES   = $(PATH_PcBiosBin)/PcBiosBin.c
    34 PcBiosBin_DEPS      = $(PATH_PcBiosBin)/pcbios-syms.h
     33PcBiosBin_SOURCES   = $(PcBiosBin_0_OUTDIR)/PcBiosBin.c
     34PcBiosBin_DEPS      = $(PcBiosBin_0_OUTDIR)/pcbios-syms.h
    3535PcBiosBin_CLEAN     = \
    36         $(PATH_PcBiosBin)/_rombios_.c \
    37         $(PATH_PcBiosBin)/rombios0.s \
    38         $(PATH_PcBiosBin)/rombios1.s \
    39         $(PATH_PcBiosBin)/pcbios.lst \
    40         $(PATH_PcBiosBin)/pcbios.tmp \
    41         $(PATH_PcBiosBin)/pcbios.bin \
    42         $(PATH_PcBiosBin)/PcBiosBin.c \
    43         $(PATH_PcBiosBin)/pcbios-syms.h
     36        $(PcBiosBin_0_OUTDIR)/_rombios_.c \
     37        $(PcBiosBin_0_OUTDIR)/rombios0.s \
     38        $(PcBiosBin_0_OUTDIR)/rombios1.s \
     39        $(PcBiosBin_0_OUTDIR)/pcbios.lst \
     40        $(PcBiosBin_0_OUTDIR)/pcbios.tmp \
     41        $(PcBiosBin_0_OUTDIR)/pcbios.bin \
     42        $(PcBiosBin_0_OUTDIR)/PcBiosBin.c \
     43        $(PcBiosBin_0_OUTDIR)/pcbios-syms.h
    4444
    4545#
    4646# Rule for making the bios.
    4747#
    48 $$(PATH_PcBiosBin)/PcBiosBin.c: $$(PATH_PcBiosBin)/pcbios.bin $(VBOX_BIN2C)
     48$$(PcBiosBin_0_OUTDIR)/PcBiosBin.c: $$(PcBiosBin_0_OUTDIR)/pcbios.bin $(VBOX_BIN2C)
    4949        $(call MSG_TOOL,bin2c,PcBiosBin,$<,$@)
    5050        $(QUIET)$(VBOX_BIN2C) -min 64 -max 256 -mask 0xffff -ascii -export PcBiosBinary $< $@
     
    5555
    5656# 1. precompile rombios.c
    57 $$(PATH_PcBiosBin)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c \
     57$$(PcBiosBin_0_OUTDIR)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c \
    5858                $(PATH_SUB_CURRENT)/apmbios.S $(if $(VBOX_WITH_SCSI),$(PATH_SUB_CURRENT)/scsi.c) \
    5959                $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h \
     
    6161        $(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
    6262        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E \
    63                 -I$(PATH_PcBiosBin) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) \
     63                -I$(PcBiosBin_0_OUTDIR) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) \
    6464                -DBX_SMP_PROCESSORS=1 -DVBOX -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) \
    6565                $(if $(VBOX_WITH_SCSI),-DVBOX_WITH_SCSI) \
     
    6868# 2. compile to intermediate asm file.
    6969# BCC tempfile clashes, order the BCC jobs to make sure they don't interfere with one another.
    70 $$(PATH_PcBiosBin)/rombios0.s: $$(PATH_PcBiosBin)/_rombios_.c | $(VBOX_BCC_JOBS)
     70$$(PcBiosBin_0_OUTDIR)/rombios0.s: $$(PcBiosBin_0_OUTDIR)/_rombios_.c | $(VBOX_BCC_JOBS)
    7171        $(call MSG_COMPILE,PcBiosBin,$<,$@,C)
    7272        $(QUIET)$(VBOX_BCC) -o $@ -C-c -D__i86__ -0 -S $<
    73 VBOX_BCC_JOBS += $(PATH_PcBiosBin)/rombios0.s
     73VBOX_BCC_JOBS += $(PcBiosBin_0_OUTDIR)/rombios0.s
    7474
    7575# 3. post process intermediate asm file.
    76 $$(PATH_PcBiosBin)/rombios1.s: $$(PATH_PcBiosBin)/rombios0.s
     76$$(PcBiosBin_0_OUTDIR)/rombios1.s: $$(PcBiosBin_0_OUTDIR)/rombios0.s
    7777        $(call MSG_TOOL,Adjusting BCC Assembly,PcBiosBin,$<,$@)
    7878        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
    7979
    8080# 4. assemble the intermediate asm file. (also creates a listing rombios.lst)
    81 $$(PATH_PcBiosBin)/pcbios.tmp + $$(PATH_PcBiosBin)/pcbios.lst: $$(PATH_PcBiosBin)/rombios1.s
     81$$(PcBiosBin_0_OUTDIR)/pcbios.tmp + $$(PcBiosBin_0_OUTDIR)/pcbios.lst: $$(PcBiosBin_0_OUTDIR)/rombios1.s
    8282        $(call MSG_COMPILE,PcBiosBin,$<,$@,AS)
    83         $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_PcBiosBin)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_PcBiosBin)/pcbios.lst
     83        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PcBiosBin_0_OUTDIR)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PcBiosBin_0_OUTDIR)/pcbios.lst
    8484
    8585# 5. calculate checksums for the final BIOS image.
    86 $$(PATH_PcBiosBin)/pcbios.bin: $$(PATH_PcBiosBin)/pcbios.tmp $$(VBOX_BIOSSUMS)
     86$$(PcBiosBin_0_OUTDIR)/pcbios.bin: $$(PcBiosBin_0_OUTDIR)/pcbios.tmp $$(VBOX_BIOSSUMS)
    8787        $(call MSG_TOOL,biossums,PcBiosBin,$<,$@)
    8888        $(QUIET)$(VBOX_BIOSSUMS) $< $@
    8989
    9090# 6. create the symbol table.
    91 $$(PATH_PcBiosBin)/pcbios-syms.h: $$(PATH_PcBiosBin)/pcbios.lst $(MAKEFILE_CURRENT)
     91$$(PcBiosBin_0_OUTDIR)/pcbios-syms.h: $$(PcBiosBin_0_OUTDIR)/pcbios.lst $(MAKEFILE_CURRENT)
    9292        $(call MSG_GENERATE,PcBiosBin,$<,$@)
    9393        $(QUIET)$(SED) \
     
    9595                -e 's/^[0-9][0-9][0-9][0-9][0-9]                       \(000[0-9A-F]*\)            [[:space:]]*\([a-zA-Z0-9_]*\):.*$$/    DEFSYM(0x\1, "\2"),/' \
    9696                --output $@ \
    97                 $(PATH_PcBiosBin)/pcbios.lst
     97                $(PcBiosBin_0_OUTDIR)/pcbios.lst
    9898
    9999
  • trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk

    r35368 r35380  
    115115
    116116VBoxBFE_INCS = \
    117         $(PATH_VBoxBFE) \
     117        $(VBoxBFE_0_OUTDIR) \
    118118        $(VBOX_PATH_SDK)/include \
    119119        $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE
     
    158158        -fno-rtti -fno-exceptions -fshort-wchar -pthread
    159159
    160 VBoxBFE_CLEAN = $(PATH_VBoxBFE)/Ico64x01.h
    161 VBoxBFE_SDLConsole.cpp_DEPS = $(PATH_VBoxBFE)/Ico64x01.h
     160VBoxBFE_CLEAN = $(VBoxBFE_0_OUTDIR)/Ico64x01.h
     161VBoxBFE_SDLConsole.cpp_DEPS = $(VBoxBFE_0_OUTDIR)/Ico64x01.h
    162162
    163163# Convert the pnm-file to a byte array.
    164 $$(PATH_VBoxBFE)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
     164$$(VBoxBFE_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxBFE/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
    165165        $(call MSG_TOOL,bin2c,VBoxBFE,$<,$@)
    166166        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
  • trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

    r33590 r35380  
    7474
    7575VBoxSDL_INCS = \
    76         $(PATH_VBoxSDL)
     76        $(VBoxSDL_0_OUTDIR)
    7777ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    7878VBoxSDL_INCS += \
     
    9999        -framework Foundation -framework AppKit
    100100
    101 VBoxSDL_CLEAN = $(PATH_VBoxSDL)/Ico64x01.h
    102 VBoxSDL_INTERMEDIATES = $(PATH_VBoxSDL)/Ico64x01.h
     101VBoxSDL_CLEAN = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
     102VBoxSDL_INTERMEDIATES = $(VBoxSDL_0_OUTDIR)/Ico64x01.h
    103103
    104104
    105105# Convert the pnm-file to a byte array.
    106 $$(PATH_VBoxSDL)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
     106$$(VBoxSDL_0_OUTDIR)/Ico64x01.h: $(PATH_ROOT)/src/VBox/Frontends/VBoxSDL/ico64x01.pnm $(VBOX_BIN2C) | $$(dir $$@)
    107107        $(call MSG_TOOL,bin2c,VBoxSDL,$<,$@)
    108108        $(QUIET)$(VBOX_BIN2C) Ico64x01 $< $@
    109109
    110110# Icon include file.
    111 $$(PATH_VBoxSDL)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_PATH)/Makefile.kmk | $$(dir $$@)
     111$$(VBoxSDL_0_OUTDIR)/VBoxSDL-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $$(VBoxSDL_PATH)/Makefile.kmk | $$(dir $$@)
    112112        $(RM) -f $@
    113113        $(APPEND) $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
     
    130130tstSDL_DEFS.linux = VBOX_OPENGL
    131131endif
    132 tstSDL_INCS = \
    133         $(PATH_tstSDL)
    134132
    135133tstSDL_LIBS = \
  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r34813 r35380  
    194194VirtualBox_INCS = \
    195195        $(VBOX_GUI_INC_DIRS) \
    196         $(PATH_VirtualBox)/include
     196        $(VirtualBox_0_OUTDIR)/include
    197197
    198198# Necessary for the hdd backend enumeration
     
    659659## @todo This needs some cleaning up perhaps...
    660660## @todo kBuild: Non-existing +| targets should be tried remade or what?
    661 VirtualBox_BLDDIRS       += $(PATH_VirtualBox)/include
    662 VirtualBox_INTERMEDIATES += $(PATH_VirtualBox)/include/COMWrappers.h
     661VirtualBox_BLDDIRS       += $(VirtualBox_0_OUTDIR)/include
     662VirtualBox_INTERMEDIATES += $(VirtualBox_0_OUTDIR)/include/COMWrappers.h
    663663VirtualBox_CLEAN         += \
    664         $(PATH_VirtualBox)/include/COMWrappers \
    665         $(PATH_VirtualBox)/include/COMWrappers.tmp \
    666         $(PATH_VirtualBox)/include/COMWrappers.h \
    667         $(PATH_VirtualBox)/include/COMWrappers.cpp
    668 VirtualBox_SOURCES       += $(PATH_VirtualBox)/include/COMWrappers.cpp
    669 
    670 $$(PATH_VirtualBox)/include/COMWrappers \
    671 +| $$(PATH_VirtualBox)/include/COMWrappers.h \
    672 +| $$(PATH_VirtualBox)/include/COMWrappers.cpp: \
     664        $(VirtualBox_0_OUTDIR)/include/COMWrappers \
     665        $(VirtualBox_0_OUTDIR)/include/COMWrappers.tmp \
     666        $(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
     667        $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
     668VirtualBox_SOURCES       += $(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp
     669
     670$$(VirtualBox_0_OUTDIR)/include/COMWrappers \
     671+| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.h \
     672+| $$(VirtualBox_0_OUTDIR)/include/COMWrappers.cpp: \
    673673                $(VBOX_XIDL_FILE) \
    674674                $(VBOX_VIRTUALBOX4_SRC)/src/globals/COMWrappers.xsl \
     
    697697
    698698# alias for generating the COM Wrappers file.
    699 testwrappers:: $$(PATH_VirtualBox)/include/COMWrappers.h
     699testwrappers:: $$(VirtualBox_0_OUTDIR)/include/COMWrappers.h
    700700
    701701
     
    818818# The IDI_ICON1 name is Qt specific.
    819819#
    820 src/platform/win/VirtualBox.rc_INCS  = $(PATH_VirtualBox)
    821 src/platform/win/VirtualBox.rc_DEPS  = $(PATH_VirtualBox)/VirtualBox-icon.rc
    822 src/platform/win/VirtualBox.rc_CLEAN = $(PATH_VirtualBox)/VirtualBox-icon.rc
    823 
    824 $$(PATH_VirtualBox)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
     820src/platform/win/VirtualBox.rc_INCS  = $(VirtualBox_0_OUTDIR)
     821src/platform/win/VirtualBox.rc_DEPS  = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
     822src/platform/win/VirtualBox.rc_CLEAN = $(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc
     823
     824$$(VirtualBox_0_OUTDIR)/VirtualBox-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$@)
    825825        $(APPEND) -t $@ 'IDI_ICON1 ICON "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
    826826
     
    847847VirtualBox.app_SOURCES = \
    848848        src/platform/darwin/PkgInfo \
    849         $(PATH_VirtualBox.app)/Info.plist \
     849        $(VirtualBox_0_OUTDIR.app)/Info.plist \
    850850        $(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
    851851        $(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
     
    855855        $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns
    856856
    857 $$(PATH_VirtualBox.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     857$$(VirtualBox_0_OUTDIR.app)/Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    858858        $(call MSG_GENERATE,VirtualBox.app,$<,$@)
    859859        $(QUIET)$(RM) -f $@
     
    873873VirtualBoxVM.app_SOURCES = \
    874874        src/platform/darwin/VM-PkgInfo=>PkgInfo \
    875         $(PATH_VirtualBoxVM.app)/VM-Info.plist=>Info.plist
     875        $(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist=>Info.plist
    876876VirtualBoxVM.app_SYMLINKS = \
    877877        MacOS=>../../../MacOS/ \
    878878        Resources=>../../../Resources/
    879879
    880 $$(PATH_VirtualBoxVM.app)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     880$$(VirtualBoxVM.app_0_OUTDIR)/VM-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/VM-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    881881        $(call MSG_GENERATE,VirtualBoxVM.app,$<,$@)
    882882        $(QUIET)$(RM) -f $@
     
    902902vmstarter.app_SOURCES = \
    903903        src/platform/darwin/vmstarter-PkgInfo=>PkgInfo \
    904         $(PATH_vmstarter.app)/vmstarter-Info.plist=>Info.plist
     904        $(vmstarter.app_0_OUTDIR)/vmstarter-Info.plist=>Info.plist
    905905vmstarter.app_SYMLINKS = \
    906906    MacOS=>../../../MacOS \
    907907    Resources=>../../../Resources
    908908
    909 $$(PATH_vmstarter.app)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
     909$$(vmstarter.app_0_OUTDIR)/vmstarter-Info.plist: $(PATH_SUB_CURRENT)/src/platform/darwin/vmstarter-Info.plist $(VBOX_VERSION_MK) | $$(@D)/
    910910        $(call MSG_GENERATE,vmstarter.app,$<,$@)
    911911        $(QUIET)$(RM) -f $@
  • trunk/src/VBox/GuestHost/SharedClipboard/Makefile.kmk

    r28800 r35380  
    2424  # Set these in LocalConfig.kmk if you are working on the X11 clipboard service
    2525  # to automatically run the unit tests at build time:
    26   #    OTHERS += $(PATH_tstClipboardX11)/tstClipboardX11.run
    27   #    OTHERS += $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
     26  #    OTHERS += $(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run
     27  #    OTHERS += $(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run
    2828  #
    2929  PROGRAMS += tstClipboardX11 tstClipboardX11Smoke
    30   TESTING  += $(PATH_tstClipboardX11)/tstClipboardX11.run $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
     30  TESTING  += \
     31        $(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run \
     32        $(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run
    3133  tstClipboardX11_TEMPLATE = VBOXR3TSTEXE
    3234  tstClipboardX11_DEFS     = VBOX_WITH_HGCM TESTCASE
    3335  tstClipboardX11_SOURCES  = x11-clipboard.cpp clipboard-helper.cpp
    34   tstClipboardX11_CLEAN    = $(PATH_tstClipboardX11)/tstClipboardX11.run
     36  tstClipboardX11_CLEAN    = $(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run
    3537
    3638  tstClipboardX11Smoke_TEMPLATE = VBOXR3TSTEXE
     
    3941  tstClipboardX11Smoke_LIBPATH  = $(VBOX_LIBPATH_X11)
    4042  tstClipboardX11Smoke_LIBS     = X11 Xt
    41   tstClipboardX11Smoke_CLEAN    = $(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run
     43  tstClipboardX11Smoke_CLEAN    = $(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run
    4244
    43 $$(PATH_tstClipboardX11)/tstClipboardX11.run: $$(INSTARGET_tstClipboardX11)
     45$$(tstClipboardX11_0_OUTDIR)/tstClipboardX11.run: $$(INSTARGET_tstClipboardX11)
    4446        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11) quiet
    4547        $(QUIET)$(APPEND) -t "$@" "done"
    4648
    47 $$(PATH_tstClipboardX11Smoke)/tstClipboardX11Smoke.run: $$(INSTARGET_tstClipboardX11)
     49$$(tstClipboardX11Smoke_0_OUTDIR)/tstClipboardX11Smoke.run:     $$(INSTARGET_tstClipboardX11)
    4850        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11Smoke) quiet
    4951        $(QUIET)$(APPEND) -t "$@" "done"
  • trunk/src/VBox/HostDrivers/Makefile.kmk

    r34484 r35380  
    5757  HostDrivers-dkms-sh_INST    = bin/src/
    5858  HostDrivers-dkms-sh_MODE    = a+rx,u+w
    59   HostDrivers-dkms-sh_SOURCES = $(PATH_HostDrivers-dkms-sh)/do_dkms
    60   HostDrivers-dkms-sh_CLEAN   = $(PATH_HostDrivers-dkms-sh)/do_dkms
     59  HostDrivers-dkms-sh_SOURCES = $(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms
     60  HostDrivers-dkms-sh_CLEAN   = $(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms
    6161
    6262  INSTALLS += HostDrivers-dkms-src
    6363  HostDrivers-dkms-src_INST    = bin/src/
    6464  HostDrivers-dkms-src_MODE    = a+r,u+w
    65   HostDrivers-dkms-src_SOURCES = $(PATH_HostDrivers-dkms-src)/dkms.conf
    66   HostDrivers-dkms-src_CLEAN   = $(PATH_HostDrivers-dkms-src)/dkms.conf
     65  HostDrivers-dkms-src_SOURCES = $(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf
     66  HostDrivers-dkms-src_CLEAN   = $(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf
    6767
    68 $$(PATH_HostDrivers-dkms-src)/dkms.conf: \
     68$$(HostDrivers-dkms-src_0_OUTDIR)/dkms.conf: \
    6969                $(PATH_SUB_CURRENT)/linux/dkms.conf \
    7070                $(VBOX_VERSION_STAMP) \
     
    7777                --output $@ $<
    7878
    79 $$(PATH_HostDrivers-dkms-sh)/do_dkms: \
     79$$(HostDrivers-dkms-sh_0_OUTDIR)/do_dkms: \
    8080                $(PATH_SUB_CURRENT)/linux/do_dkms \
    8181                $(VBOX_VERSION_STAMP) \
  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r34484 r35380  
    141141endif
    142142ifeq ($(VBOX_LDR_FMT),lx)
    143 SUPR0_SOURCES      += $$(PATH_SUPR0)/SUPR0.def
    144 $$(PATH_SUPR0)/SUPR0.def: $(PATH_SUB_CURRENT)/SUPR0.def | $$(dir $$@)
     143SUPR0_SOURCES      += $$(SUPR0_0_OUTDIR)/SUPR0.def
     144$$(SUPR0_0_OUTDIR)/SUPR0.def: $(PATH_SUB_CURRENT)/SUPR0.def | $$(dir $$@)
    145145        $(SED) \
    146146                -e 's/^[ \t][ \t]*\([gA-Z]\)/    _\1/' \
     
    264264vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
    265265vboxdrv-mod_SOURCES += \
    266         $(PATH_vboxdrv-mod)/Makefile
     266        $(vboxdrv-mod_0_OUTDIR)/Makefile
    267267vboxdrv-mod_CLEAN   = \
    268         $(PATH_vboxdrv-mod)/Makefile
     268        $(vboxdrv-mod_0_OUTDIR)/Makefile
    269269
    270270vboxdrv-sh_INST     = bin/src/vboxdrv
     
    272272vboxdrv-sh_SOURCES  = $(subst ",,$(FILES_VBOXDRV_BIN)) #"
    273273vboxdrv-sh_SOURCES += \
    274         $(PATH_vboxdrv-sh)/build_in_tmp \
     274        $(vboxdrv-sh_0_OUTDIR)/build_in_tmp \
    275275        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    276276vboxdrv-sh_CLEAN    = \
    277277        $(PATH_TARGET)/vboxdrv-sh-1.dep \
    278         $(PATH_vboxdrv-sh)/build_in_tmp
     278        $(vboxdrv-sh_0_OUTDIR)/build_in_tmp
    279279
    280280# Scripts needed for building the kernel modules
    281281
    282 $$(PATH_vboxdrv-sh)/build_in_tmp: \
     282$$(vboxdrv-sh_0_OUTDIR)/build_in_tmp: \
    283283                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    284284                $(VBOX_VERSION_STAMP) \
     
    292292
    293293includedep $(PATH_TARGET)/vboxdrv-sh-1.dep
    294 $$(PATH_vboxdrv-mod)/Makefile: \
     294$$(vboxdrv-mod_0_OUTDIR)/Makefile: \
    295295                $(PATH_SUB_CURRENT)/linux/Makefile \
    296296                $$(if $$(eq $$(Support/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
     
    339339INSTALLS += VBoxDrv.kext
    340340VBoxDrv.kext_INST     = $(INST_VBOXDRV)Contents/
    341 VBoxDrv.kext_SOURCES  = $(PATH_VBoxDrv.kext)/Info.plist
    342 VBoxDrv.kext_CLEAN    = $(PATH_VBoxDrv.kext)/Info.plist
    343 
    344 $$(PATH_VBoxDrv.kext)/Info.plist: \
     341VBoxDrv.kext_SOURCES  = $(VBoxDrv.kext_0_OUTDIR)/Info.plist
     342VBoxDrv.kext_CLEAN    = $(VBoxDrv.kext_0_OUTDIR)/Info.plist
     343
     344$$(VBoxDrv.kext_0_OUTDIR)/Info.plist: \
    345345                $(PATH_SUB_CURRENT)/darwin/Info.plist \
    346346                $(VBOX_VERSION_MK) | $$(dir $$@)
     
    420420vboxdrv-mod_SOURCES = $(subst ",,$(FILES_VBOXDRV_NOBIN)) #"
    421421vboxdrv-mod_SOURCES += \
    422         $(PATH_vboxdrv-mod)/Makefile
     422        $(vboxdrv-mod_0_OUTDIR)/Makefile
    423423vboxdrv-mod_CLEAN   = \
    424         $(PATH_vboxdrv-mod)/Makefile
    425 
    426 $$(PATH_vboxdrv-mod)/Makefile: \
     424        $(vboxdrv-mod_0_OUTDIR)/Makefile
     425
     426$$(vboxdrv-mod_0_OUTDIR)/Makefile: \
    427427                $(PATH_SUB_CURRENT)/freebsd/Makefile \
    428428                $$(if $$(eq $$(Support/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
  • trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

    r33540 r35380  
    6868VBoxNetAdp.kext_INST     = $(INST_VBOXNETADP)Contents/
    6969VBoxNetAdp.kext_SOURCES  = \
    70         $(PATH_VBoxNetAdp.kext)/Info.plist
     70        $(VBoxNetAdp.kext_0_OUTDIR)/Info.plist
    7171VBoxNetAdp.kext_CLEAN    = \
    72         $(PATH_VBoxNetAdp.kext)/Info.plist
     72        $(VBoxNetAdp.kext_0_OUTDIR)/Info.plist
    7373
    74 $$(PATH_VBoxNetAdp.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
     74$$(VBoxNetAdp.kext_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
    7575        $(call MSG_GENERATE,VBoxNetAdp,$@,$<)
    7676        $(QUIET)$(RM) -f $@
     
    103103 VBoxNetAdp-src_SOURCES = $(subst ",,$(VBOX_VBOXNETADP_SOURCES)) #"
    104104 VBoxNetAdp-src_SOURCES+= \
    105         $(PATH_VBoxNetAdp-src)/Makefile
     105        $(VBoxNetAdp-src_0_OUTDIR)/Makefile
    106106 VBoxNetAdp-src_CLEAN   = \
    107         $(PATH_VBoxNetAdp-src)/Makefile \
     107        $(VBoxNetAdp-src_0_OUTDIR)/Makefile     \
    108108        $(PATH_TARGET)/VBoxNetAdp-src-1.dep
    109109
     
    111111 VBoxNetAdp-sh_MODE    = a+rx,u+w
    112112 VBoxNetAdp-sh_SOURCES = \
    113         $(PATH_VBoxNetAdp-sh)/build_in_tmp \
     113        $(VBoxNetAdp-sh_0_OUTDIR)/build_in_tmp \
    114114        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    115  VBoxNetAdp-sh_CLEAN   = $(PATH_VBoxNetAdp-sh)/build_in_tmp
     115 VBoxNetAdp-sh_CLEAN   = $(VBoxNetAdp-sh_0_OUTDIR)/build_in_tmp
    116116
    117117
    118118includedep $(PATH_TARGET)/VBoxNetAdp-src-1.dep
    119 $$(PATH_VBoxNetAdp-src)/Makefile: \
     119$$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
    120120                $(PATH_SUB_CURRENT)/linux/Makefile \
    121121                $$(if $$(eq $$(VBoxNetAdp/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
     
    131131## Scripts needed for building the kernel modules
    132132
    133 $$(PATH_VBoxNetAdp-sh)/build_in_tmp: \
     133$$(VBoxNetAdp-sh_0_OUTDIR)/build_in_tmp: \
    134134                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    135135                $(VBOX_VERSION_STAMP) \
     
    152152 VBoxNetAdp-src_SOURCES = $(subst ",,$(VBOX_VBOXNETADP_SOURCES)) #"
    153153 VBoxNetAdp-src_SOURCES+= \
    154         $(PATH_VBoxNetAdp-src)/Makefile
     154        $(VBoxNetAdp-src_0_OUTDIR)/Makefile
    155155 VBoxNetAdp-src_CLEAN   = \
    156         $(PATH_VBoxNetAdp-src)/Makefile \
     156        $(VBoxNetAdp-src_0_OUTDIR)/Makefile     \
    157157
    158 $$(PATH_VBoxNetAdp-src)/Makefile: \
     158$$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
    159159                $(PATH_SUB_CURRENT)/freebsd/Makefile \
    160160                $$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
  • trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

    r33540 r35380  
    7373VBoxNetFlt.kext_INST     = $(INST_VBOXNETFLT)Contents/
    7474VBoxNetFlt.kext_SOURCES  = \
    75         $(PATH_VBoxNetFlt.kext)/Info.plist
     75        $(VBoxNetFlt.kext_0_OUTDIR)/Info.plist
    7676VBoxNetFlt.kext_CLEAN    = \
    77         $(PATH_VBoxNetFlt.kext)/Info.plist
    78 
    79 $$(PATH_VBoxNetFlt.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
     77        $(VBoxNetFlt.kext_0_OUTDIR)/Info.plist
     78
     79$$(VBoxNetFlt.kext_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
    8080        $(call MSG_GENERATE,VBoxNetFlt,$@,$<)
    8181        $(QUIET)$(RM) -f $@
     
    209209VBoxNetFltNotify_DEFS       = _WIN32_WINNT=0x0500 WIN32 _ATL_STATIC_REGISTRY
    210210VBoxNetFltNotify_INCS       = \
    211         $(PATH_VBoxNetFltNotify)
     211        $(VBoxNetFltNotify_0_OUTDIR)
    212212VBoxNetFltNotify_SOURCES    = \
    213213        win/notifyobj/VBoxNetFltNotify.cpp \
     
    218218#VBoxNetFltNotify_INTERMEDIATES =
    219219VBoxNetFltNotify_DEPS       = \
    220         $(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_i.c \
    221         $(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_p.c \
    222         $(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.h \
    223         $(PATH_VBoxNetFltNotify)/dlldata.c \
    224         $(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.tlb
     220        $(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_i.c \
     221        $(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_p.c \
     222        $(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.h \
     223        $(VBoxNetFltNotify_0_OUTDIR)/dlldata.c \
     224        $(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.tlb
    225225VBoxNetFltNotify_CLEAN      = $(VBoxNetFltNotify_DEPS)
    226226
     
    231231        ) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
    232232
    233 $$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_i.c \
    234 + $$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn_p.c \
    235 + $$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.h \
    236 + $$(PATH_VBoxNetFltNotify)/dlldata.c \
    237 + $$(PATH_VBoxNetFltNotify)/VBoxNetFltNotifyn.tlb: \
     233$$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_i.c \
     234+ $$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn_p.c \
     235+ $$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.h \
     236+ $$(VBoxNetFltNotify_0_OUTDIR)/dlldata.c \
     237+ $$(VBoxNetFltNotify_0_OUTDIR)/VBoxNetFltNotifyn.tlb: \
    238238                $(PATH_SUB_CURRENT)/win/notifyobj/VBoxNetFltNotifyn.idl \
    239239                | $$(dir $$@)
    240240        $(VBOXNETFLT_NOTIFY_IDL) /nologo \
    241                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_VBoxNetFltNotify)) \
     241                /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxNetFltNotify_0_OUTDIR)) \
    242242                /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
    243243                $(addprefix /I , $(call VBOX_FN_MAKE_WIN_PATH,$(SDK_W2K3DDK_INCS))) \
     
    363363 VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
    364364 VBoxNetFlt-src_SOURCES+= \
    365         $(PATH_VBoxNetFlt-src)/Makefile
     365        $(VBoxNetFlt-src_0_OUTDIR)/Makefile
    366366 VBoxNetFlt-src_CLEAN   = \
    367         $(PATH_VBoxNetFlt-src)/Makefile \
     367        $(VBoxNetFlt-src_0_OUTDIR)/Makefile     \
    368368        $(PATH_TARGET)/VBoxNetFlt-src-1.dep
    369369
     
    371371 VBoxNetFlt-sh_MODE    = a+rx,u+w
    372372 VBoxNetFlt-sh_SOURCES = \
    373         $(PATH_VBoxNetFlt-sh)/build_in_tmp \
     373        $(VBoxNetFlt-sh_0_OUTDIR)/build_in_tmp \
    374374        $(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers
    375  VBoxNetFlt-sh_CLEAN   = $(PATH_VBoxNetFlt-sh)/build_in_tmp
     375 VBoxNetFlt-sh_CLEAN   = $(VBoxNetFlt-sh_0_OUTDIR)/build_in_tmp
    376376
    377377
    378378 includedep $(PATH_TARGET)/VBoxNetFlt-src-1.dep
    379  $$(PATH_VBoxNetFlt-src)/Makefile: \
     379 $$(VBoxNetFlt-src_0_OUTDIR)/Makefile: \
    380380                $(PATH_SUB_CURRENT)/linux/Makefile \
    381381                $$(if $$(eq $$(VBoxNetFlt/linux/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
     
    390390
    391391 # Script needed for building the kernel module
    392  $$(PATH_VBoxNetFlt-sh)/build_in_tmp: \
     392 $$(VBoxNetFlt-sh_0_OUTDIR)/build_in_tmp: \
    393393                $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    394394                $(VBOX_VERSION_STAMP) \
     
    417417 VBoxNetFlt-src_SOURCES = $(subst ",,$(VBOX_VBOXNETFLT_SOURCES)) #"
    418418 VBoxNetFlt-src_SOURCES+= \
    419         $(PATH_VBoxNetFlt-src)/Makefile
     419        $(VBoxNetFlt-src_0_OUTDIR)/Makefile
    420420 VBoxNetFlt-src_CLEAN   = \
    421         $(PATH_VBoxNetFlt-src)/Makefile \
    422 
    423  $$(PATH_VBoxNetFlt-src)/Makefile: \
     421        $(VBoxNetFlt-src_0_OUTDIR)/Makefile     \
     422
     423 $$(VBoxNetFlt-src_0_OUTDIR)/Makefile: \
    424424                $(PATH_SUB_CURRENT)/freebsd/Makefile \
    425425                $$(if $$(eq $$(VBoxNetFlt/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
  • trunk/src/VBox/HostDrivers/VBoxUSB/darwin/Makefile.kmk

    r31898 r35380  
    3838INSTALLS += VBoxUSB.kext
    3939VBoxUSB.kext_INST     = $(INST_VBOXUSB)Contents/
    40 VBoxUSB.kext_SOURCES  = $(PATH_VBoxUSB.kext)/Info.plist
    41 VBoxUSB.kext_CLEAN    = $(PATH_VBoxUSB.kext)/Info.plist
     40VBoxUSB.kext_SOURCES  = $(VBoxUSB.kext_0_OUTDIR)/Info.plist
     41VBoxUSB.kext_CLEAN    = $(VBoxUSB.kext_0_OUTDIR)/Info.plist
    4242
    43 $$(PATH_VBoxUSB.kext)/Info.plist: $(PATH_SUB_CURRENT)/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
     43$$(VBoxUSB.kext_0_OUTDIR)/Info.plist: $(PATH_SUB_CURRENT)/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
    4444        $(call MSG_GENERATE,VBoxUSB,$@,$<)
    4545        $(QUIET)$(RM) -f $@
  • trunk/src/VBox/HostServices/GuestControl/testcase/Makefile.kmk

    r28800 r35380  
    2323 # Set this in LocalConfig.kmk if you are working on the guest property
    2424 # service to automatically run the testcase at build time.
    25  #    OTHERS += $(PATH_tstGuestControlSvc)/tstGuestControlSvc.run
     25 #    OTHERS += $(tstGuestControlSvc_0_OUTDIR)/tstGuestControlSvc.run
    2626 #
    2727
    2828 PROGRAMS += tstGuestControlSvc
    29  TESTING  += $(PATH_tstGuestPropSvc)/tstGuestControlSvc.run
     29 TESTING  += $(tstGuestControlSvc_0_OUTDIR)/tstGuestControlSvc.run
    3030 tstGuestControlSvc_TEMPLATE = VBOXR3TSTEXE
    3131 # The second define here is to ensure that the testcase will run fast,
     
    3838 tstGuestControlSvc_LIBS     = $(LIB_RUNTIME)
    3939
    40 $$(PATH_tstGuestControlSvc)/tstGuestControlSvc.run: $$(INSTARGET_tstGuestControlSvc)
     40$$(tstGuestControlSvc_0_OUTDIR)/tstGuestControlSvc.run: $$(INSTARGET_tstGuestControlSvc)
    4141        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstGuestControlSvc) quiet
    4242        $(QUIET)$(APPEND) -t "$@" "done"
  • trunk/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk

    r28800 r35380  
    2323 # Set this in LocalConfig.kmk if you are working on the guest property
    2424 # service to automatically run the testcase at build time.
    25  #    OTHERS += $(PATH_tstGuestPropSvc)/tstGuestPropSvc.run
     25 #    OTHERS += $(tstGuestPropSvc_0_OUTDIR)/tstGuestPropSvc.run
    2626 #
    2727
    2828 PROGRAMS += tstGuestPropSvc
    29  TESTING  += $(PATH_tstGuestPropSvc)/tstGuestPropSvc.run
     29 TESTING  += $(tstGuestPropSvc_0_OUTDIR)/tstGuestPropSvc.run
    3030 tstGuestPropSvc_TEMPLATE = VBOXR3TSTEXE
    3131 # The second define here is to ensure that the testcase will run fast,
     
    3535 tstGuestPropSvc_LIBS     = $(LIB_RUNTIME)
    3636
    37 $$(PATH_tstGuestPropSvc)/tstGuestPropSvc.run: $$(INSTARGET_tstGuestPropSvc)
     37$$(tstGuestPropSvc_0_OUTDIR)/tstGuestPropSvc.run: $$(INSTARGET_tstGuestPropSvc)
    3838        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstGuestPropSvc) quiet
    3939        $(QUIET)$(APPEND) -t "$@" "done"
  • trunk/src/VBox/HostServices/SharedClipboard/Makefile.kmk

    r28800 r35380  
    7070 # Set this in LocalConfig.kmk if you are working on the X11 clipboard service
    7171 # to automatically run the unit test at build time.
    72  #       OTHERS += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
     72 #       OTHERS += $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
    7373 PROGRAMS += tstClipboardX11-2
    74  TESTING += $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
     74 TESTING += $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
    7575 tstClipboardX11-2_TEMPLATE = VBOXR3TSTEXE
    7676 tstClipboardX11-2_DEFS     = VBOX_WITH_HGCM TESTCASE
    7777 tstClipboardX11-2_SOURCES  = x11-clipboard.cpp
    7878 tstClipboardX11-2_LIBS     = $(LIB_RUNTIME)
    79  tstClipboardX11-2_CLEANS   = $(PATH_tstClipboardX11-2)/tstClipboardX11-2.run
     79 tstClipboardX11-2_CLEANS   = $(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run
    8080
    81 $$(PATH_tstClipboardX11-2)/tstClipboardX11-2.run: $$(INSTARGET_tstClipboardX11-2)
     81$$(tstClipboardX11-2_0_OUTDIR)/tstClipboardX11-2.run: $$(INSTARGET_tstClipboardX11-2)
    8282        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstClipboardX11-2) quiet
    8383        $(QUIET)$(APPEND) -t "$@" "done"
  • trunk/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk

    r28800 r35380  
    2323#
    2424PROGRAMS += tstShflSizes
    25 TESTING  += $(PATH_tstShflSizes)/tstShflSizes.run
     25TESTING  += $(tstShflSizes_0_OUTDIR)/tstShflSizes.run
    2626ifndef VBOX_ONLY_SDK
    2727 ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    2828  if1of ($(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH), x86.x86 amd64.amd64 x86.amd64)
    29     OTHERS += $(PATH_tstShflSizes)/tstShflSizes.run
     29    OTHERS += $(tstShflSizes_0_OUTDIR)/tstShflSizes.run
    3030  endif
    3131 endif
     
    3434tstShflSizes_DEFS     = VBOX_WITH_HGCM
    3535tstShflSizes_SOURCES  = tstShflSizes.cpp
    36 tstShflSizes_CLEAN    = $(PATH_tstShflSizes)/tstShflSizes.run
     36tstShflSizes_CLEAN    = $(tstShflSizes_0_OUTDIR)/tstShflSizes.run
    3737
    38 $$(PATH_tstShflSizes)/tstShflSizes.run: $$(INSTARGET_tstShflSizes)
     38$$(tstShflSizes_0_OUTDIR)/tstShflSizes.run: $$(INSTARGET_tstShflSizes)
    3939        $(INSTARGET_tstShflSizes) quiet
    4040        $(QUIET)$(APPEND) -t "$@" "done"
  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r33146 r35380  
    5757        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \
    5858        $(VBOX_PATH_SDK)/bindings/mscom/include \
     59## @todo r=bird: This does NOT work when running make from HostService or any of its subdirectories!
    5960VBoxSharedCrOpenGL_INCS = \
    60         $(PATH_VBoxSVC) \
    61         $(PATH_VBoxCOM)
     61        $(VBoxSVC_0_OUTDIR) \
     62        $(VBoxCOM_0_OUTDIR)
    6263ifdef VBOX_WITH_XPCOM
    6364 VBoxSharedCrOpenGL_INCS += \
     
    148149        $(VBOX_PATH_CROGL_GENFILES)/server_dispatch.h
    149150ifdef VBOXCR_LOGFPS
    150 VBoxOGLcrserverlib_DEFS += VBOXCR_LOGFPS 
    151 endif   
     151VBoxOGLcrserverlib_DEFS += VBOXCR_LOGFPS
     152endif
    152153
    153154#
  • trunk/src/VBox/HostServices/testcase/Makefile.kmk

    r28800 r35380  
    2424  # Set this in LocalConfig.kmk if you are working on HGCM service internals
    2525  # to automatically run the unit test at build time:
    26   #    OTHERS += $(PATH_tstHGCMSvc)/tstHGCMSvc.run
     26  #    OTHERS += $(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run
    2727  #
    2828  PROGRAMS += tstHGCMSvc
    29   TESTING  += $(PATH_tstHGCMSvc)/tstHGCMSvc.run
     29  TESTING  += $(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run
    3030  tstHGCMSvc_TEMPLATE = VBOXR3TSTEXE
    3131  tstHGCMSvc_DEFS     = VBOX_WITH_HGCM VBOX_TEST_HGCM_PARMS
    3232  tstHGCMSvc_SOURCES  = tstHGCMSvc.cpp
    33   tstHGCMSvc_CLEAN    = $(PATH_tstHGCMSvc)/tstHGCMSvc.run
     33  tstHGCMSvc_CLEAN    = $(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run
    3434
    35 $$(PATH_tstHGCMSvc)/tstHGCMSvc.run: $$(INSTARGET_tstHGCMSvc)
     35$$(tstHGCMSvc_0_OUTDIR)/tstHGCMSvc.run: $$(INSTARGET_tstHGCMSvc)
    3636        export VBOX_LOG_DEST=nofile; $(INSTARGET_tstHGCMSvc) quiet
    3737        $(QUIET)$(APPEND) -t "$@" "done"
  • trunk/src/VBox/Installer/freebsd/Makefile.kmk

    r34563 r35380  
    6060        $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_32px.png=>VBox.png \
    6161        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
    62         $(if $(VBOX_WITH_QTGUI),$(PATH_freebsd-misc)/virtualbox.desktop,)
    63 freebsd-misc_CLEAN = $(PATH_freebsd-misc)/virtualbox.desktop
     62        $(if $(VBOX_WITH_QTGUI),$(freebsd-misc_0_OUTDIR)/virtualbox.desktop,)
     63freebsd-misc_CLEAN = $(freebsd-misc_0_OUTDIR)/virtualbox.desktop
    6464
    6565$$(PATH_freebsd-misc)/virtualbox.desktop: $(PATH_SUB_CURRENT)/virtualbox.desktop $(VBOX_VERSION_STAMP) | $$(dir $$@)
  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r35206 r35380  
    7777        $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.xml \
    7878        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
    79         $(if $(VBOX_WITH_QTGUI),$(PATH_linux-misc)/virtualbox.desktop,)
    80 linux-misc_CLEAN = $(PATH_linux-misc)/virtualbox.desktop
     79        $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,)
     80linux-misc_CLEAN = $(linux-misc_0_OUTDIR)/virtualbox.desktop
    8181
    8282$$(PATH_linux-misc)/virtualbox.desktop: $(PATH_ROOT)/src/VBox/Installer/common/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
  • trunk/src/VBox/Installer/win/Resources/Makefile.kmk

    r34355 r35380  
    2626
    2727# The icon location is configurable.
    28 VBoxRes.rc_INCS += $(PATH_VBoxRes)
    29 VBoxRes.rc_DEPS += $(PATH_VBoxRes)/VBoxRes-icons.rc
    30 VBoxRes.rc_CLEAN = $(PATH_VBoxRes)/VBoxRes-icons.rc
     28VBoxRes.rc_INCS += $(VBoxRes_0_OUTDIR)
     29VBoxRes.rc_DEPS += $(VBoxRes_0_OUTDIR)/VBoxRes-icons.rc
     30VBoxRes.rc_CLEAN = $(VBoxRes_0_OUTDIR)/VBoxRes-icons.rc
    3131
    3232# The resource path.
     
    5656        $(VBOX_WINDOWS_ICON_EXT_OVF)
    5757
    58 $$(PATH_VBoxRes)/VBoxRes-icons.rc: \
     58$$(VBoxRes_0_OUTDIR)/VBoxRes-icons.rc: \
    5959                $$(VBOX_RESOURCES_WIN) $(MAKEFILE_CURRENT) | $$(dir $$@)
    6060        $(RM) -f $@
  • trunk/src/VBox/Installer/win/Stub/Makefile.kmk

    r31667 r35380  
    4242
    4343# The icon location is configurable.
    44 VBoxStub.rc_INCS += $(PATH_VBoxStub)
    45 VBoxStub.rc_DEPS += $(PATH_VBoxStub)/VBoxStub-icon.rc
    46 VBoxStub.rc_CLEAN = $(PATH_VBoxStub)/VBoxStub-icon.rc
     44VBoxStub.rc_INCS += $(VBoxStub_0_OUTDIR)
     45VBoxStub.rc_DEPS += $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc
     46VBoxStub.rc_CLEAN = $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc
    4747
    4848# Icon include file.
    49 $$(PATH_VBoxStub)/VBoxStub-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(MAKEFILE_CURRENT) | $$(dir $$@)
     49$$(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc: $(VBOX_WINDOWS_ICON_FILE) $(MAKEFILE_CURRENT) | $$(dir $$@)
    5050        $(APPEND) -t $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
    5151
  • trunk/src/VBox/Main/Makefile.kmk

    r35376 r35380  
    3737 # used by some rules
    3838 PATH_VBoxCOM    = $(PATH_TARGET)/VBoxCOM
    39  BLDDIRS        += $(PATH_VBoxCOM) $(PATH_BIN)/components
     39 BLDDIRS        += $(VBoxCOM_0_OUTDIR) $(PATH_BIN)/components
    4040 # I'm Evil! Dr. Evil.
    4141 include $(KBUILD_PATH)/tools/VCC70.kmk
     
    8787        $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb \
    8888        $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
    89         $(PATH_VBoxCOM)/VirtualBox.h   \
    90         $(PATH_VBoxCOM)/VirtualBox_i.c \
    91         $(PATH_VBoxCOM)/VirtualBox.tlb
    92 
    93  VBOX_MAIN_PREREQS += $(PATH_VBoxCOM)/VirtualBox_i.c
     89        $(VBoxCOM_0_OUTDIR)/VirtualBox.h   \
     90        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
     91        $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
     92
     93 VBOX_MAIN_PREREQS += $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
    9494 BLDDIRS += $(VBOX_PATH_SDK)/bindings/mscom/idl
    9595endif
     
    252252VBoxSVC_INCS = \
    253253        include \
    254         $(PATH_VBoxSVC) \
     254        $(VBoxSVC_0_OUTDIR) \
    255255        $(dir $(VBOX_XML_SCHEMADEFS_H)) \
    256256        .
    257257VBoxSVC_INCS.win = \
    258         $(PATH_VBoxCOM)
     258        $(VBoxCOM_0_OUTDIR)
    259259ifdef VBOX_WITH_USB
    260260 VBoxSVC_INCS.os2 = \
     
    427427endif
    428428
    429 src-server/win/VBoxSVC.rc_INCS  = $(PATH_VBoxSVC)
    430 src-server/win/VBoxSVC.rc_DEPS  = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
    431 src-server/win/VBoxSVC.rc_CLEAN = $(PATH_VBoxSVC)/VBoxSVC.rgs $(PATH_VBoxSVC)/VBoxSVC-icon.rc
    432 
    433 $$(PATH_VBoxSVC)/VBoxSVC-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D))
     429src-server/win/VBoxSVC.rc_INCS  = $(VBoxSVC_0_OUTDIR)
     430src-server/win/VBoxSVC.rc_DEPS  = $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
     431src-server/win/VBoxSVC.rc_CLEAN = $(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs $(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc
     432
     433$$(VBoxSVC_0_OUTDIR)/VBoxSVC-icon.rc: $(MAKEFILE_CURRENT) $(VBOX_WINDOWS_ICON_FILE) | $$(dir $$(@D))
    434434        $(APPEND) -t $@ '1 ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
    435435
    436 $$(PATH_VBoxSVC)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D))
     436$$(VBoxSVC_0_OUTDIR)/VBoxSVC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$(@D))
    437437        $(VBOX_XSLTPROC) --stringparam Module VBoxSVC -o $@ $< $(VBOX_XIDL_FILE)
    438438
     
    451451VBOX_XML_CONVERTER_TEMPLATE   = $(VBOX_PATH_MAIN_SRC)/xml/SettingsConverter.xsl
    452452
    453 $$(PATH_VBoxSVC)/xml_VirtualBox_settings_xsd.h: $(VBOX_XML_SCHEMA.$(KBUILD_TARGET)) $(VBOX_BIN2C)
     453$$(VBoxSVC_0_OUTDIR)/xml_VirtualBox_settings_xsd.h: $(VBOX_XML_SCHEMA.$(KBUILD_TARGET)) $(VBOX_BIN2C)
    454454        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
    455455        $(QUIET)$(VBOX_BIN2C) _xml_VirtualBox_settings_xsd $< $@
    456456
    457 $$(PATH_VBoxSVC)/xml_VirtualBox_settings_common_xsd.h: $(VBOX_XML_SCHEMA_COMMON) $(VBOX_BIN2C)
     457$$(VBoxSVC_0_OUTDIR)/xml_VirtualBox_settings_common_xsd.h: $(VBOX_XML_SCHEMA_COMMON) $(VBOX_BIN2C)
    458458        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
    459459        $(QUIET)$(VBOX_BIN2C) _xml_VirtualBox_settings_common_xsd $< $@
    460460
    461 $$(PATH_VBoxSVC)/xml_SettingsConverter_xsl.h: $(VBOX_XML_CONVERTER_TEMPLATE) $(VBOX_BIN2C)
     461$$(VBoxSVC_0_OUTDIR)/xml_SettingsConverter_xsl.h: $(VBOX_XML_CONVERTER_TEMPLATE) $(VBOX_BIN2C)
    462462        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
    463463        $(QUIET)$(VBOX_BIN2C) _xml_SettingsConverter_xsl $< $@
     
    539539VBoxSVCM_INCS           = \
    540540        include \
    541         $(PATH_VBoxC) \
     541        $(VBoxC_0_OUTDIR) \
    542542        .
    543543VBoxSVCM_INTERMEDIATES  = $(VBOX_MAIN_PREREQS)
     
    546546VBoxSVCM_LDFLAGS.darwin = \
    547547        -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxSVCM.dylib \
    548         -exported_symbols_list $(PATH_VBoxSVCM)/VBoxSVCM.def
     548        -exported_symbols_list $(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def
    549549 ifeq ($(KBUILD_TARGET),darwin)
    550 VBoxSVCM_ORDERDEPS     += $(PATH_VBoxSVCM)/VBoxSVCM.def
    551 VBoxSVCM_CLEAN         += $(PATH_VBoxSVCM)/VBoxSVCM.def
    552 $$(PATH_VBoxSVCM)/VBoxSVCM.def:
     550VBoxSVCM_ORDERDEPS     += $(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def
     551VBoxSVCM_CLEAN         += $(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def
     552$$(VBoxSVCM_0_OUTDIR)/VBoxSVCM.def:
    553553        $(RM) -f $@
    554554        $(APPEND) $@ _NSGetModule
     
    594594VBoxC_INCS          = \
    595595        include \
    596         $(PATH_VBoxC) \
     596        $(VBoxC_0_OUTDIR) \
    597597        $(dir $(VBOX_XML_SCHEMADEFS_H))
    598598VBoxC_INCS.win      = \
    599         $(PATH_VBoxCOM) \
     599        $(VBoxCOM_0_OUTDIR) \
    600600        .
    601601
    602602VBoxC_LDFLAGS.darwin = \
    603603        -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxC.dylib \
    604         -exported_symbols_list $(PATH_VBoxC)/VBoxC.def \
     604        -exported_symbols_list $(VBoxC_0_OUTDIR)/VBoxC.def \
    605605        -framework IOKit
    606606ifdef VBOX_USE_VCC80
     
    684684
    685685ifeq ($(KBUILD_TARGET),darwin)
    686 VBoxC_ORDERDEPS += $(PATH_VBoxC)/VBoxC.def
    687 VBoxC_CLEAN     += $(PATH_VBoxC)/VBoxC.def
    688 $$(PATH_VBoxC)/VBoxC.def: $(MAKEFILE_CURRENT)
     686VBoxC_ORDERDEPS += $(VBoxC_0_OUTDIR)/VBoxC.def
     687VBoxC_CLEAN     += $(VBoxC_0_OUTDIR)/VBoxC.def
     688$$(VBoxC_0_OUTDIR)/VBoxC.def: $(MAKEFILE_CURRENT)
    689689        $(RM) -f $@
    690690        $(APPEND) $@ _NSGetModule
     
    697697
    698698
    699 src-client/win/VBoxC.rc_DEPS = $(PATH_VBoxC)/VBoxC.rgs $(PATH_VBoxCOM)/VirtualBox.tlb
    700 VBoxC_CLEAN.win  += $(PATH_VBoxC)/VBoxC.rgs
    701 
    702 $$(PATH_VBoxC)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(PATH_VBoxC)/
     699src-client/win/VBoxC.rc_DEPS = $(VBoxC_0_OUTDIR)/VBoxC.rgs $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
     700VBoxC_CLEAN.win  += $(VBoxC_0_OUTDIR)/VBoxC.rgs
     701
     702$$(VBoxC_0_OUTDIR)/VBoxC.rgs: $(VBOX_PATH_MAIN_SRC)/src-all/win/VirtualBox_rgs.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
    703703        $(VBOX_XSLTPROC) --stringparam Module VBoxC -o $@ $< $(VBOX_XIDL_FILE)
    704704
     
    725725 VBoxCOM_DEFS.amd64    += _WIN32_WINNT=0x0510
    726726 VBoxCOM_SOURCES       += \
    727         $(PATH_VBoxCOM)/VirtualBox_i.c
     727        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
    728728else # !win
    729729 VBoxCOM_SOURCES       += \
     
    817817testidlhdr: $(VBOX_IDL_HEADER.XPCOM)
    818818else
    819 testidl:    $(VBOX_IDL_FILE.MSCOM) $(PATH_VBoxCOM)/VirtualBox_i.c
     819testidl:    $(VBOX_IDL_FILE.MSCOM) $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c
    820820endif
    821821
     
    826826#
    827827# What needs to be done is to not depend on _i.c in the object subdir, but on all the final outputs.
    828 $(PATH_VBoxCOM)/VirtualBox_i.c \
     828$(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
    829829+ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
    830 + $(PATH_VBoxCOM)/VirtualBox.h \
     830+ $(VBoxCOM_0_OUTDIR)/VirtualBox.h \
    831831+ $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
    832 + $(PATH_VBoxCOM)/VirtualBox.tlb \
    833 + $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $(call DIRDEP,$(PATH_VBoxCOM))
     832+ $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb \
     833+ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $(call DIRDEP,$(VBoxCOM_0_OUTDIR))
    834834        $(VBOX_MAIN_IDL) $(IDL_DEFS) \
    835                 /out $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_VBoxCOM)) \
     835                /out $(call VBOX_FN_MAKE_WIN_PATH,$(VBoxCOM_0_OUTDIR)) \
    836836                /cpp_cmd $(subst $(EXEC_X86_WIN32),,$(call VBOX_FN_MAKE_WIN_PATH,$(TOOL_$(VBOX_VCC_TOOL)_CC))) \
    837837                /I $(call VBOX_FN_MAKE_WIN_PATH,$(PATH_SDK_WINPSDK_INC)) \
     
    839839                $(call VBOX_FN_MAKE_WIN_PATH,$<)
    840840        $(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/include
    841         $(CP) $(PATH_VBoxCOM)/VirtualBox.h $(VBOX_PATH_SDK)/bindings/mscom/include
     841        $(CP) $(VBoxCOM_0_OUTDIR)/VirtualBox.h $(VBOX_PATH_SDK)/bindings/mscom/include
    842842        $(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/lib
    843         $(CP) $(PATH_VBoxCOM)/VirtualBox.tlb $(VBOX_PATH_SDK)/bindings/mscom/lib
    844         $(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(VBOX_PATH_SDK)/bindings/mscom/lib
     843        $(CP) $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb $(VBOX_PATH_SDK)/bindings/mscom/lib
     844        $(CP) $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c $(VBOX_PATH_SDK)/bindings/mscom/lib
    845845
    846846#
  • trunk/src/VBox/VMM/Makefile.kmk

    r35362 r35380  
    255255 endif
    256256 ifeq ($(VBOX_LDR_FMT32),lx)
    257   VMMRCBuiltin_SOURCES = $(PATH_VMMRCBuiltin)/VMMRCBuiltin.def
    258   $$(PATH_VMMRCBuiltin)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@)
     257  VMMRCBuiltin_SOURCES = $(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def
     258  $$(VMMRCBuiltin_0_OUTDIR)/VMMRCBuiltin.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRCBuiltin.def | $$(dir $$@)
    259259        $(SED) -e '/not-os2/d' -e 's/^[ \t][ \t]*\([a-zA-Z]\)/    _\1/' -e 's/[ \t]DATA[ \t]*/ /' --output $@ $<
    260260 endif
     
    266266 LIBRARIES += VMMRCImp
    267267 VMMRCImp_TEMPLATE = VBoxRc
    268  VMMRCImp_SOURCES = $(PATH_VMMRCImp)/VMMRC.def
    269  VMMRCImp_CLEAN   = $(PATH_VMMRCImp)/VMMRC.def
    270 
    271  $$(PATH_VMMRCImp)/VMMRC.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRC.def | $$(dir $$@)
     268 VMMRCImp_SOURCES = $(VMMRCImp_0_OUTDIR)/VMMRC.def
     269 VMMRCImp_CLEAN   = $(VMMRCImp_0_OUTDIR)/VMMRC.def
     270
     271 $$(VMMRCImp_0_OUTDIR)/VMMRC.def: $(PATH_SUB_CURRENT)/VMMRC/VMMRC.def | $$(dir $$@)
    272272 ifeq ($(VBOX_LDR_FMT32),lx)
    273273        $(SED) \
     
    295295 LIBRARIES += VMMR0Imp
    296296 VMMR0Imp_TEMPLATE = VBoxR0
    297  VMMR0Imp_SOURCES  = $(PATH_VMMR0Imp)/VMMR0.def
    298  VMMR0Imp_CLEAN    = $(PATH_VMMR0Imp)/VMMR0.def
    299 
    300  $$(PATH_VMMR0Imp)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
     297 VMMR0Imp_SOURCES  = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
     298 VMMR0Imp_CLEAN    = $(VMMR0Imp_0_OUTDIR)/VMMR0.def
     299
     300 $$(VMMR0Imp_0_OUTDIR)/VMMR0.def: $(PATH_SUB_CURRENT)/VMMR0/VMMR0.def | $$(dir $$@)
    301301 ifeq ($(VBOX_LDR_FMT),lx)
    302302        $(SED) \
     
    411411 endif
    412412 ifeq ($(VBOX_LDR_FMT32),lx)
    413   VMMRC_SOURCES += $(PATH_VMMRCImp)/VMMRC.def
     413  VMMRC_SOURCES += $(VMMRCImp_0_OUTDIR)/VMMRC.def
    414414 endif
    415415
     
    502502 endif
    503503 ifeq ($(VBOX_LDR_FMT),lx)
    504   VMMR0_SOURCES += $(PATH_VMMR0Imp)/VMMR0.def
     504  VMMR0_SOURCES += $(VMMR0Imp_0_OUTDIR)/VMMR0.def
    505505 endif
    506506 VMMR0_SOURCES.amd64 = \
Note: See TracChangeset for help on using the changeset viewer.

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