summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Config.kmk12
-rwxr-xr-xconfigure12
-rw-r--r--configure.vbs6
-rw-r--r--src/VBox/Runtime/Makefile.kmk10
-rw-r--r--src/VBox/Storage/testcase/Makefile.kmk8
-rw-r--r--src/libs/Makefile.kmk2
6 files changed, 25 insertions, 25 deletions
diff --git a/Config.kmk b/Config.kmk
index 99757f6f81e..422a65ae109 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -5041,10 +5041,10 @@ ifdef VBOX_WITH_LIBVPX
endif
# libxml2
-SDK_VBOX_LIBXML2 := libxml2 for dll linking.
-SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.9.14/include
-SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT LIBXML_STATIC LIBXML_STATIC_FOR_DLL
-SDK_VBOX_LIBXML2_DEFS.win ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_COMPILER_TLS
+SDK_VBoXLibXml2 := libxml2 for dll linking.
+SDK_VBoXLibXml2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.9.14/include
+SDK_VBoXLibXml2_DEFS ?= _REENTRANT LIBXML_STATIC LIBXML_STATIC_FOR_DLL
+SDK_VBoXLibXml2_DEFS.win ?= WIN32 _WINDOWS _MBCS HAVE_WIN32_THREADS HAVE_COMPILER_TLS
# Note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
# libxml against VBoxRT
@@ -6588,7 +6588,7 @@ ifneq ($(KBUILD_TARGET_ARCH),x86)
TEMPLATE_VBoxR3Static_LIBS.x86 += \
$(VBOX_LIB_RUNTIME_STATIC_X86)
endif
-ifndef SDK_VBOX_LIBXML2_LIBS
+ifndef SDK_VBoXLibXml2_LIBS
TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB)
endif
@@ -6879,7 +6879,7 @@ ifeq ($(KBUILD_TARGET),win)
endif
TEMPLATE_VBoxR3AutoTest_INST = $(INST_TESTCASE)
TEMPLATE_VBoxR3AutoTest_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
- $(if-expr !defined(SDK_VBOX_LIBXML2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
+ $(if-expr !defined(SDK_VBoXLibXml2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
$(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
,$(SDK_VBoxLzf_STATIC_LIBS) $(SDK_VBOX_ZLIB_STATIC_LIBS) \
,$(SDK_VBoxLzf_LIBS) $(SDK_VBOX_ZLIB_LIBS)) \
diff --git a/configure b/configure
index c0af18a65ee..681f59652cc 100755
--- a/configure
+++ b/configure
@@ -732,9 +732,9 @@ EOF
[ -n "$INCXML2" ] && I_INCXML2=`prefix_I "$INCXML2"`
if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
if test_execute; then
- cnf_append "SDK_VBOX_LIBXML2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
- cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
- cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+ cnf_append "SDK_VBoXLibXml2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
+ cnf_append "SDK_VBoXLibXml2_INCS" "$INCXML2"
+ cnf_append "SDK_VBoXLibXml2_LIBS" "`strip_l "$LIBXML2"`"
fi
fi
fi
@@ -766,9 +766,9 @@ EOF
[ -n "$INCXML2" ] && I_INCXML2=`prefix_I "$INCXML2"`
if test_compile "$LIBXML2 $LIBPTHREAD $I_INCXML2" xml2 xml2; then
if test_execute; then
- cnf_append "SDK_VBOX_LIBXML2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
- cnf_append "SDK_VBOX_LIBXML2_INCS" "$INCXML2"
- cnf_append "SDK_VBOX_LIBXML2_LIBS" "`strip_l "$LIBXML2"`"
+ cnf_append "SDK_VBoXLibXml2_DEFS" "_REENTRANT" ## @todo get defines from --cflags
+ cnf_append "SDK_VBoXLibXml2_INCS" "$INCXML2"
+ cnf_append "SDK_VBoXLibXml2_LIBS" "`strip_l "$LIBXML2"`"
fi
fi
fi
diff --git a/configure.vbs b/configure.vbs
index c412cdbad2c..4d55fcc3674 100644
--- a/configure.vbs
+++ b/configure.vbs
@@ -1580,9 +1580,9 @@ sub CheckForXml2(strOptXml2)
end if
strPathXml2 = UnixSlashes(PathAbs(strPathXml2))
- CfgPrintAssign "SDK_VBOX_LIBXML2_DEFS", "_REENTRANT"
- CfgPrintAssign "SDK_VBOX_LIBXML2_INCS", strPathXml2 & "/include"
- CfgPrintAssign "SDK_VBOX_LIBXML2_LIBS", strPathXml2 & "/lib/libxml2.lib"
+ CfgPrintAssign "SDK_VBoXLibXml2_DEFS", "_REENTRANT"
+ CfgPrintAssign "SDK_VBoXLibXml2_INCS", strPathXml2 & "/include"
+ CfgPrintAssign "SDK_VBoXLibXml2_LIBS", strPathXml2 & "/lib/libxml2.lib"
PrintResult "libxml2", strPathXml2
end sub
diff --git a/src/VBox/Runtime/Makefile.kmk b/src/VBox/Runtime/Makefile.kmk
index b945edec69b..fc0fe54cc4c 100644
--- a/src/VBox/Runtime/Makefile.kmk
+++ b/src/VBox/Runtime/Makefile.kmk
@@ -318,7 +318,7 @@ endif
# inherited from by RuntimeR3(.lib) and VBoxR3(.dll).
#
RuntimeBaseR3_TEMPLATE = VBoxR3Static
-RuntimeBaseR3_SDKS = VBOX_LIBXML2
+RuntimeBaseR3_SDKS = VBoXLibXml2
RuntimeBaseR3_SDKS.win = $(VBOX_WINPSDK) $(VBOX_WINDDK)
RuntimeBaseR3_DEFS = \
IN_RT_R3 \
@@ -2761,7 +2761,7 @@ RuntimeGuestR3Shared-x86_BLD_TRG_ARCH := x86
# VBoxRT - Shared Object / DLL version.
#
VBoxRT_TEMPLATE = VBoxR3DllNoPic
-VBoxRT_SDKS = VBOX_LIBXML2
+VBoxRT_SDKS = VBoXLibXml2
ifdef VBOX_WITH_LIBCURL
VBoxRT_SDKS += VBoxLibCurl
endif
@@ -2855,7 +2855,7 @@ VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeBaseR3_INCS.$(KBU
VBoxRT_LIBS = \
$(SDK_VBoxLzf_LIBS) \
$(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
-ifndef SDK_VBOX_LIBXML2_LIBS
+ifndef SDK_VBoXLibXml2_LIBS
VBoxRT_LIBS += \
$(PATH_STAGE_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
endif
@@ -3000,7 +3000,7 @@ endif
VBoxRT-x86_EXTENDS = VBoxRT
VBoxRT-x86_TEMPLATE = VBoxR3Dll-x86
VBoxRT-x86_INST.win = $(INST_DLL)x86/
-VBoxRT-x86_SDKS = VBOX_LIBXML2
+VBoxRT-x86_SDKS = VBoXLibXml2
ifdef VBOX_WITH_LIBCURL
VBoxRT-x86_SDKS += VBoxLibCurl-x86
endif
@@ -3012,7 +3012,7 @@ if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
VBoxRT-x86_LIBS += \
$(PATH_STAGE_LIB)/SUPR3-x86$(VBOX_SUFF_LIB)
endif
-ifndef SDK_VBOX_LIBXML2_LIBS
+ifndef SDK_VBoXLibXml2_LIBS
VBoxRT-x86_LIBS += \
$(PATH_STAGE_LIB)/VBox-libxml2-x86$(VBOX_SUFF_LIB)
endif
diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk
index 9479a9c4327..f0ca5d20944 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -170,12 +170,12 @@ if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VBOX_IMG)
$(SDK_VBOX_ZLIB_LIBS)
endif
ifeq ($(KBUILD_TARGET),linux)
- ifdef SDK_VBOX_LIBXML2_LIBS
+ ifdef SDK_VBoXLibXml2_LIBS
vbox-img_LIBS += xml2
endif
else ifeq ($(KBUILD_TARGET),freebsd)
vbox-img_LIBS += iconv geom bsdxml sbuf
- ifdef SDK_VBOX_LIBXML2_LIBS
+ ifdef SDK_VBoXLibXml2_LIBS
vbox-img_LIBS += xml2 lzma
endif
else ifeq ($(KBUILD_TARGET),darwin)
@@ -184,7 +184,7 @@ if defined(VBOX_WITH_TESTCASES) || defined(VBOX_WITH_VBOX_IMG)
vbox-img_SDKS.win = VBOX_NTDLL
else ifeq ($(KBUILD_TARGET),solaris)
vbox-img_LIBS += kstat efi
- ifdef SDK_VBOX_LIBXML2_LIBS
+ ifdef SDK_VBoXLibXml2_LIBS
vbox-img_LIBS += xml2
endif
endif
@@ -220,7 +220,7 @@ if defined(VBOX_WITH_TESTCASES) && defined(VBOX_WITH_PLUGIN_CRYPT) \
$(SDK_VBOX_ZLIB_LIBS)
endif
ifeq ($(KBUILD_TARGET),linux)
- ifdef SDK_VBOX_LIBXML2_LIBS
+ ifdef SDK_VBoXLibXml2_LIBS
vdkeystoremgr_LIBS += xml2
endif
else if1of ($(KBUILD_TARGET),darwin freebsd)
diff --git a/src/libs/Makefile.kmk b/src/libs/Makefile.kmk
index 1decd49a3a6..7024a1ab370 100644
--- a/src/libs/Makefile.kmk
+++ b/src/libs/Makefile.kmk
@@ -88,7 +88,7 @@ endif
# libxml2 used by the IPRT xml C++ API.
if !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) \
&& !defined(VBOX_ONLY_ADDITIONS)
- ifeq ($(SDK_VBOX_LIBXML2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.9.14/include)
+ ifeq ($(SDK_VBoXLibXml2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.9.14/include)
include $(PATH_SUB_CURRENT)/libxml2-2.9.14/Makefile.kmk
endif
endif
View Lorry Controller Status