Changeset 2482 in vbox

Timestamp:

May 4, 2007 2:02:17 AM (18 years ago)

Author:

vboxsync

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

20909

Message:

Drop PATH_CURRENT from the global DEFS as it plays merry poppins with sub-makefiles (command deps changes depending on which directory you invoke it from).

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (7 diffs)
• src/VBox/Main/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (3 diffs)
• src/recompiler/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -564 +564 @@
 #
 ## @todo PATH_CURRENT has to go, fix the places where we rely on it.
-INCS += $(PATH_ROOT)/include $(PATH_CURRENT) $(PATH_OUT)
+INCS += $(PATH_ROOT)/include $(PATH_OUT)
 DEFS += VBOX
 DEFS.debug := DEBUG DEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) DEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))

trunk/src/VBox/Devices/Makefile.kmk

@@ -145 +145 @@
 VBoxDD2_TEMPLATE        = VBOXR3
 VBoxDD2_DEFS            = IN_VBOXDD2
+VBoxDD2_INCS           := \
+        $(PATH_SUB_CURRENT)
 VBoxDD2_SOURCES         = \
         Builtins2.cpp \
@@ -169 +171 @@
 DevicesR3_TEMPLATE      = VBOXR3
 DevicesR3_SDKS.win      = WINPSDK W2K3DDK
-DevicesR3_INCS          = \
-        $(PATH_CURRENT)
+DevicesR3_INCS         := \
+        $(PATH_SUB_CURRENT)
 DevicesR3_SOURCES       = \
         Input/DevPS2.cpp \
@@ -218 +220 @@
 VBoxDDGC_DEFS           =
 VBoxDDGC_SYSSUFF        = .gc
-VBoxDDGC_INCS           = \
-        $(PATH_CURRENT)
+VBoxDDGC_INCS          := \
+        $(PATH_SUB_CURRENT)
 VBoxDDGC_SOURCES        = \
         Bus/DevPCI.cpp \
@@ -254 +256 @@
 VBoxDDR0_SYSSUFF        = .r0
 VBoxDDR0_DEFS           = IN_RT_R0
-VBoxDDR0_INCS           = \
-        $(PATH_CURRENT)
+VBoxDDR0_INCS          := \
+        $(PATH_SUB_CURRENT)
 VBoxDDR0_SOURCES        = \
         Bus/DevPCI.cpp \
@@ -292 +294 @@
 VBoxDD2GC_DEFS           =
 VBoxDD2GC_SYSSUFF        = .gc
-VBoxDD2GC_INCS           = \
-        $(PATH_CURRENT)
+VBoxDD2GC_INCS          := \
+        $(PATH_SUB_CURRENT)
 VBoxDD2GC_SOURCES        = \
         PC/DevAPIC.cpp
@@ -312 +314 @@
 VBoxDD2R0_DEFS           = IN_RT_R0
 VBoxDD2R0_SYSSUFF        = .r0
-VBoxDD2R0_INCS           = \
-        $(PATH_CURRENT)
+VBoxDD2R0_INCS          := \
+        $(PATH_SUB_CURRENT)
 VBoxDD2R0_SOURCES        = \
         PC/DevAPIC.cpp
@@ -339 +341 @@
 Storage/DrvHostDVD.cpp_SDKS.win = W2K3DDK
 Drivers_DEFS       = IN_IDE_R3
-Drivers_INCS       = \
+Drivers_INCS      := \
+        $(PATH_SUB_CURRENT) \
         Network/slirp
 Drivers_SOURCES    = \

trunk/src/VBox/Main/Makefile.kmk

@@ -135 +135 @@
         $(PATH_VBoxSVC) \
         $(PATH_VBoxCOM)
+VBoxSVC_INCS.win := \
+        $(PATH_SUB_CURRENT)
 ifdef VBOX_WITH_XPCOM
  VBoxSVC_LIBS += \
@@ -265 +267 @@
         $(PATH_VBoxC) \
         $(PATH_VBoxCOM)
+VBoxC_INCS.win     := \
+        $(PATH_SUB_CURRENT)
 VBoxC_LDFLAGS.darwin = -install_name @executable_path/components/VBoxC.dylib
 ifdef VBOX_USE_VCC80

trunk/src/VBox/Runtime/Makefile.kmk

@@ -654 +654 @@
 RuntimeR0Drv_TEMPLATE   = VBOXR0DRV
 RuntimeR0Drv_SDKS.win   = W2K3DDK WINPSDKINCS
+RuntimeR0Drv_INCS      := $(PATH_SUB_CURRENT)
 RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS
 RuntimeR0Drv_DEFS.win   = IN_SUP_R0
@@ -775 +776 @@
 RuntimeW32GuestR0_TEMPLATE      = VBOXW32GUESTR0LIB
 RuntimeW32GuestR0_SDKS          = W2K3DDKX86 WINPSDKINCS
+RuntimeW32GuestR0_INCS         := $(PATH_SUB_CURRENT)
 RuntimeW32GuestR0_DEFS          = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS  IN_SUP_R0
 RuntimeW32GuestR0_SOURCES       = \

trunk/src/VBox/VMM/Makefile.kmk

@@ -54 +54 @@
  endif
 endif                
-VMMR3_INCS      = PATM
+VMMR3_INCS      := \
+        PATM \
+        $(PATH_SUB_CURRENT)
 
 VMMR3_SOURCES   = \
@@ -193 +195 @@
 #
 VMMGC_TEMPLATE  = VBOXGC
-VMMGC_INCS      = . VMMGC
-VMMGC_INCS     += PATM
+VMMGC_INCS     := \
+         $(PATH_SUB_CURRENT) \
+         VMMGC \
+     PATM
 VMMGC_DEFS      = IN_VMM_GC IN_PDM_GC IN_CFGM_GC IN_IOM_GC IN_MM_GC IN_RT_GC IN_TRPM_GC IN_SELM_GC IN_VM_GC IN_IOM_GC IN_DIS_GC DIS_CORE_ONLY IN_PGM_GC IN_CPUM_GC IN_EM_GC IN_TM_GC IN_PATM_GC IN_CSAM_GC IN_REM_GC IN_DBGF_GC
 VMMGC_SYSSUFF   = .gc
@@ -273 +277 @@
 #
 VMMR0_TEMPLATE  = VBOXR0
-VMMR0_INCS      = . PATM
+VMMR0_INCS     := \
+        $(PATH_SUB_CURRENT) \
+        PATM
 VMMR0_DEFS      = IN_VMM_R0 IN_RT_R0 IN_TRPM_R0 IN_CPUM_R0 IN_VM_R0 IN_TM_R0 IN_INTNET_R0 IN_HWACCM_R0 IN_EM_R0 IN_PDM_R0 IN_PGM_R0 IN_DIS_R0 IN_MM_R0 IN_SELM_R0 IN_CSAM_R0 IN_PATM_R0 IN_DBGF_R0 IN_REM_R0 IN_IOM_R0 DIS_CORE_ONLY
 ifeq ($(VBOX_LDR_FMT),pe)

trunk/src/recompiler/Makefile.kmk

@@ -88 +88 @@
 endif
 dyngen_CFLAGS        += -Wno-missing-prototypes -Wno-missing-declarations
-dyngen_INCS           = \
+dyngen_INCS          := \
         InnoTek \
         target-i386 \
-        fpu
+        fpu \
+        $(PATH_SUB_CURRENT)
 dyngen_SOURCES        = dyngen.c
 
@@ -107 +108 @@
         fpu \
         $(PATH_$(REM_MOD)) \
-        $(PATH_ROOT)/src/VBox/VMM
+        $(PATH_ROOT)/src/VBox/VMM \
+        $(PATH_CURRENT)
 
 $(REM_MOD)_SOURCES          = \