Changeset 38082 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 20, 2011 2:26:24 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73029

Message:

*.kmk: Installation/staging adjustments (kBuild 0.2.0 preps).

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (11 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -81 +81 @@
  VBoxDDU_LIBS             = \
         $(LIB_RUNTIME) \
-        $(PATH_LIB)/StorageLib$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/StorageLib$(VBOX_SUFF_LIB)
  ifdef VBOX_WITH_USB
   VBoxDDU_LIBS           += \
-        $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/USBLib$(VBOX_SUFF_LIB)
   VBoxDDU_LIBS.win       += \
-        $(PATH_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB)
  endif
  ifeq ($(KBUILD_TARGET),l4)
@@ -171 +171 @@
 
  VBoxDD_LIBS             = \
-        $(PATH_LIB)/DevicesR3$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/Drivers$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/VgaDefBiosLogo$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/DevicesR3$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/Drivers$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VgaDefBiosLogo$(VBOX_SUFF_LIB) \
         $(LIB_VMM) \
         $(LIB_RUNTIME)
@@ -179 +179 @@
   VBoxDD_LIBS           += \
         $(LIB_DDU) \
-        $(PATH_LIB)/VBoxDD2.lib \
+        $(PATH_STAGE_LIB)/VBoxDD2.lib \
         $(PATH_SDK_DXSDK_LIB)/dxguid.lib
  else
@@ -193 +193 @@
  ifdef VBOX_WITH_HGSMI
   VBoxDD_LIBS           += \
-        $(PATH_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB)
  endif
 
  ifdef VBOX_WITH_NETFLT
-  VBoxDD_LIBS.win       += $(PATH_LIB)/WinNetConfig.lib
+  VBoxDD_LIBS.win       += $(PATH_STAGE_LIB)/WinNetConfig.lib
  endif
 
  ifdef VBOX_WITH_EFI
-  VBoxDD_LIBS           += $(PATH_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
+  VBoxDD_LIBS           += $(PATH_STAGE_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
  endif
 
@@ -243 +243 @@
         PC/DevLPC.cpp
  VBoxDD2_LIBS            = \
-        $(PATH_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
-        $(if $(VBOX_WITH_PXE_ROM),$(PATH_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \
+        $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
+        $(if $(VBOX_WITH_PXE_ROM),$(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \
         $(LIB_VMM) \
         $(LIB_RUNTIME)
@@ -640 +640 @@
   if1of ($(VBOX_LDR_FMT32), pe lx)
   VBoxDDGC_LIBS           = \
-        $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
   endif
  endif # VBOX_WITH_RAW_MODE
@@ -720 +720 @@
 
  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-  VBoxDDR0_SOURCES      += 
+  VBoxDDR0_SOURCES      +=
         Bus/DevPciRaw.cpp
  endif
@@ -752 +752 @@
  if1of ($(VBOX_LDR_FMT), pe lx)
  VBoxDDR0_LIBS           = \
-        $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
  endif
 
@@ -770 +770 @@
   if1of ($(VBOX_LDR_FMT32), pe lx)
    VBoxDD2GC_LIBS          = \
-        $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
   endif
  endif
@@ -789 +789 @@
  if1of ($(VBOX_LDR_FMT), pe lx)
   VBoxDD2R0_LIBS          = \
-        $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
  endif
 
@@ -1229 +1229 @@
   VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel
   VBoxPciRawR0_SOURCES  = Bus/DevPciRaw.cpp
- 
+
   Bus/DevPciRaw.cpp_INCS   = Bus
  endif