Changeset 8761 in vbox for trunk/src

Timestamp:

May 11, 2008 6:53:32 PM (17 years ago)

Author:

vboxsync

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

30741

Message:

The reminder.

Location:

trunk/src/VBox

Files:

• Additions/Makefile.kmk (modified) (2 diffs)
• Installer/linux/Makefile.kmk (modified) (1 diff)
• Runtime/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/Makefile.kmk

@@ -4 +4 @@
 #
 # Cross building of the additions is generally done by remote building
-# by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting BUILD_TARGET
+# by means of smbfs, cifs, VBOX_ONLY_ADDITIONS=1 and setting KBUILD_TARGET
 # to the desired target.
 #
@@ -13 +13 @@
 # Building the linux additions as part of the l4 build is ok because
 # l4 is built on a linux platform. This is why we have to check if
-# BUILD_TARGET is l4 or linux in some places, though most of the magic
+# KBUILD_TARGET is l4 or linux in some places, though most of the magic
 # is done in the templates (Config.kmk).
 #

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -188 +188 @@
         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
                 -e "s;_BUILD_;$(shell date);g" \
-                -e "s;_ARCH_;${BUILD_TARGET_ARCH};g" \
+                -e "s;_ARCH_;${KBUILD_TARGET_ARCH};g" \
                 < install.sh > $(PATH_TARGET)/install/install.sh
         $(QUIET)chmod 0744 $(PATH_TARGET)/install/install.sh

trunk/src/VBox/Runtime/Makefile.kmk

@@ -535 +535 @@
 #
 # RuntimeGuestR3 - Guest Additions Runtime (static).
-# (The BUILD_PLATFORM inheritance here is for l4 cross building the linux
+# (The KBUILD_HOST inheritance here is for l4 cross building the linux
 # additions, while .x86 is for cross building x86 while targeting amd64.)
 #
@@ -541 +541 @@
 RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
 RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS))
-RuntimeGuestR3_DEFS.$(KBUILD_TARGET)     := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
+RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
 RuntimeGuestR3_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST))
 RuntimeGuestR3_INCS                     := $(RuntimeR3_INCS)
-RuntimeGuestR3_INCS.$(KBUILD_TARGET)     := $(RuntimeR3_INCS.$(KBUILD_TARGET))
-RuntimeGuestR3_INCS.$(KBUILD_HOST)   := $(RuntimeR3_INCS.$(KBUILD_HOST))
+RuntimeGuestR3_INCS.$(KBUILD_TARGET)    := $(RuntimeR3_INCS.$(KBUILD_TARGET))
+RuntimeGuestR3_INCS.$(KBUILD_HOST)      := $(RuntimeR3_INCS.$(KBUILD_HOST))
 RuntimeGuestR3_SOURCES                  := $(filter-out \
         common/time/timesupref.cpp \
@@ -556 +556 @@
         VBox/logbackdoor.cpp
 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET)  := $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
-RuntimeGuestR3_SOURCES.$(KBUILD_HOST):= $(RuntimeR3_SOURCES.$(KBUILD_HOST))
-RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
-RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
+RuntimeGuestR3_SOURCES.$(KBUILD_HOST)    := $(RuntimeR3_SOURCES.$(KBUILD_HOST))
+RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
+RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).x86 := $(RuntimeR3_SOURCES.$(KBUILD_TARGET).x86)
-RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86 := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86)
+RuntimeGuestR3_SOURCES.$(KBUILD_HOST).x86   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).x86)