Index: trunk/src/libs/xpcom18a4/Config.kmk
===================================================================
--- trunk/src/libs/xpcom18a4/Config.kmk	(revision 98391)
+++ trunk/src/libs/xpcom18a4/Config.kmk	(revision 98394)
@@ -134,7 +134,7 @@
 TEMPLATE_XPComDll_LDFLAGS             = $(TEMPLATE_VBoxR3DllNonPedantic_LDFLAGS)
 ifdef VBOX_WITH_RUNPATH
-TEMPLATE_XPComDll_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
+ TEMPLATE_XPComDll_LDFLAGS           += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)'
 else ifdef VBOX_WITH_RELATIVE_RUNPATH
-TEMPLATE_XPComDll_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
+ TEMPLATE_XPComDll_LDFLAGS           += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
 endif
 TEMPLATE_XPComDll_LDFLAGS.x86         = -m32
@@ -158,24 +158,24 @@
 endif
 TEMPLATE_XPComDll_INCS                = $(VBOX_PATH_XPCOM_SRC)/xpcom/build \
-                                     $(VBOX_PATH_XPCOM_SRC)/xpcom/ds \
-                                     $(VBOX_PATH_XPCOM_SRC)/xpcom/io \
-                                     $(VBOX_PATH_XPCOM_SRC)/xpcom/base \
-                                     $(VBOX_PATH_XPCOM_SRC)/xpcom/components \
-                                     $(VBOX_PATH_XPCOM_SRC)/xpcom/threads \
-                                     $(VBOX_PATH_XPCOM_SRC)/xpcom/proxy/src \
-                                     $(VBOX_PATH_XPCOM_SRC)/xpcom/reflect/xptcall/src \
-                                     $(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/client/src \
-                                     $(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/shared/src \
-                                     $(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/lock/src \
-                                     $(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/transmngr/src \
-                                     $(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/dconnect/src \
-                                     $(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/transmngr/common \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/string \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
-                                     .
-ifn1of ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4 10.5 10.6 10.7) # FlatCarbon is gone starting 10.8 (or Xcode 5.0).
+	$(VBOX_PATH_XPCOM_SRC)/xpcom/ds \
+	$(VBOX_PATH_XPCOM_SRC)/xpcom/io \
+	$(VBOX_PATH_XPCOM_SRC)/xpcom/base \
+	$(VBOX_PATH_XPCOM_SRC)/xpcom/components \
+	$(VBOX_PATH_XPCOM_SRC)/xpcom/threads \
+	$(VBOX_PATH_XPCOM_SRC)/xpcom/proxy/src \
+	$(VBOX_PATH_XPCOM_SRC)/xpcom/reflect/xptcall/src \
+	$(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/client/src \
+	$(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/shared/src \
+	$(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/lock/src \
+	$(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/transmngr/src \
+	$(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/dconnect/src \
+	$(VBOX_PATH_XPCOM_SRC)/ipc/ipcd/extensions/transmngr/common \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/string \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
+	.
+ifn1of ($(VBOX_DEF_MACOSX_VERSION_MIN), 10.4 10.5 10.6 10.7) # FlatCarbon is gone starting 10.8 (or Xcode 5.0).
  TEMPLATE_XPComDll_DEFS.darwin       += VBOX_WITH_NEWER_OSX_SDK
  TEMPLATE_XPComDll_INCS.darwin        = \
@@ -188,5 +188,5 @@
 TEMPLATE_XPComDll_LIBS.solaris        = sendfile
 TEMPLATE_XPComDll_ORDERDEPS           = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET)) \
-                                     $(PATH_TARGET)/VBox-xpcom-idl-timestamp
+	$(PATH_TARGET)/VBox-xpcom-idl-timestamp
 ifeq ($(KBUILD_TARGET),os2)
  ifndef USE_OS2_TOOLKIT_HEADERS
@@ -224,10 +224,10 @@
 ## @todo undo -fPIC.
 TEMPLATE_XPComExe_INCS             = ipc/ipcd/shared/src \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/string \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
-                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
-                                     .
+	$(VBOX_PATH_SDK)/bindings/xpcom/include \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/string \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
+	.
 TEMPLATE_XPComExe_LIBS             = \
 	$(VBox-xpcom-ipcshared_1_TARGET) \
Index: trunk/src/libs/xpcom18a4/Makefile.kmk
===================================================================
--- trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 98391)
+++ trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 98394)
@@ -89,63 +89,63 @@
 if !defined(VBOX_ONLY_SDK) && (!defined(VBOX_ONLY_EXTPACKS) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS))
 
-VBOX_XPCOM_LIBRARIES := \
-	VBox-xpcom-nspr \
-	VBox-xpcom-typelib \
-	VBox-xpcom-string \
-	VBox-xpcom-base \
-	VBox-xpcom-ds \
-	VBox-xpcom-io \
-	VBox-xpcom-components \
-	VBox-xpcom-threads \
-	VBox-xpcom-xptinfo \
-	VBox-xpcom-xptcall \
-	VBox-xpcom-proxy \
-	VBox-xpcom-ipcshared \
-	VBoxXPCOMGlue_s \
-	$(if $(VBOX_WITH_XPCOM_GLUE_WHICH_IS_UNUSED),VBoxXPCOMGlue,)
-LIBRARIES += $(VBOX_XPCOM_LIBRARIES)
-
-VBOX_XPCOM_DLLS := \
-	VBoxXPCOM \
-	VBoxXPCOMIPCC
-DLLS += $(VBOX_XPCOM_DLLS)
+ VBOX_XPCOM_LIBRARIES := \
+ 	VBox-xpcom-nspr \
+ 	VBox-xpcom-typelib \
+ 	VBox-xpcom-string \
+ 	VBox-xpcom-base \
+ 	VBox-xpcom-ds \
+ 	VBox-xpcom-io \
+ 	VBox-xpcom-components \
+ 	VBox-xpcom-threads \
+ 	VBox-xpcom-xptinfo \
+ 	VBox-xpcom-xptcall \
+ 	VBox-xpcom-proxy \
+ 	VBox-xpcom-ipcshared \
+ 	VBoxXPCOMGlue_s \
+ 	$(if $(VBOX_WITH_XPCOM_GLUE_WHICH_IS_UNUSED),VBoxXPCOMGlue,)
+ LIBRARIES += $(VBOX_XPCOM_LIBRARIES)
+
+ VBOX_XPCOM_DLLS := \
+ 	VBoxXPCOM \
+ 	VBoxXPCOMIPCC
+ DLLS += $(VBOX_XPCOM_DLLS)
 
  ifdef VBOX_WITH_32_ON_64_MAIN_API
-LIBRARIES += $(addsuffix -x86,$(VBOX_XPCOM_LIBRARIES))
-DLLS      += $(addsuffix -x86,$(VBOX_XPCOM_DLLS))
+  LIBRARIES += $(addsuffix -x86,$(VBOX_XPCOM_LIBRARIES))
+  DLLS    += $(addsuffix -x86,$(VBOX_XPCOM_DLLS))
  endif
 
 
  ifdef VBOX_WITH_TESTCASES
-PROGRAMS += \
-	tstnsIFileTest \
-	tstTestArray \
-	tstTestAutoLock \
-	tstTestCOMPtr \
-	tstTestCOMPtrEq \
-	tstTestCRT \
-	tstTestFactory \
-	tstTestHashtables \
-	tstTestID \
-	tstTestObserverService \
-	tstTestPipes \
-	tstTestThreads \
-	tstTestXPIDLString \
-	tstTestXPTCInvoke \
-	tstTestDeque \
-	tstTestAutoPtr \
-	tstTestMinStringAPI \
-	tstTestStrings \
-	tstPrimitiveTest \
-#	tstnsIFileEnumerator
-#	tstTestAtoms
-#	tstTestServMgr
-#	tstTestCallTemplates
-#	tstTestPermanentAtoms
-#	tstSimpleTypeLib
-#	tstXptDump
-#	tstXptLink
+  PROGRAMS += \
+  	tstnsIFileTest \
+  	tstTestArray \
+  	tstTestAutoLock \
+  	tstTestCOMPtr \
+  	tstTestCOMPtrEq \
+  	tstTestCRT \
+  	tstTestFactory \
+  	tstTestHashtables \
+  	tstTestID \
+  	tstTestObserverService \
+  	tstTestPipes \
+  	tstTestThreads \
+  	tstTestXPIDLString \
+  	tstTestXPTCInvoke \
+  	tstTestDeque \
+  	tstTestAutoPtr \
+  	tstTestMinStringAPI \
+  	tstTestStrings \
+  	tstPrimitiveTest
+  #	tstnsIFileEnumerator
+  #	tstTestAtoms
+  #	tstTestServMgr
+  #	tstTestCallTemplates
+  #	tstTestPermanentAtoms
+  #	tstSimpleTypeLib
+  #	tstXptDump
+  #	tstXptLink
  endif # VBOX_WITH_TESTCASES
-PROGRAMS += VBoxXPCOMIPCD
+ PROGRAMS += VBoxXPCOMIPCD
 
 endif # !VBOX_ONLY_SDK && (!defined(VBOX_ONLY_EXTPACKS) || !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS))
@@ -212,6 +212,5 @@
 	nsprpub/pr/include/prvrsion.h \
 	nsprpub/pr/include/prwin16.h \
-	nsprpub/pr/include/md/_vbox.cfg=>prcpucfg.h \
-
+	nsprpub/pr/include/md/_vbox.cfg=>prcpucfg.h
 NSPRPUB-MD-HEADERS_INST = $(INST_SDK)bindings/xpcom/include/nsprpub/md/
 NSPRPUB-MD-HEADERS_IFFLAGS = -m 644
@@ -240,6 +239,5 @@
 	nsprpub/pr/include/md/_os2.cfg \
 	nsprpub/pr/include/md/_solaris32.cfg \
-	nsprpub/pr/include/md/_solaris64.cfg \
-
+	nsprpub/pr/include/md/_solaris64.cfg
 NSPRPUB-OBS-HEADERS_INST = $(INST_SDK)bindings/xpcom/include/nsprpub/obsolete/
 NSPRPUB-OBS-HEADERS_IFFLAGS = -m 644
@@ -459,5 +457,5 @@
  # glib and libIDL needed by XPCOM on OS/2.
  ifeq ($(VBOX_PATH_GLIB),)
- VBOX_PATH_GLIB := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/glibidl/*/glibidl/gcc335)))
+  VBOX_PATH_GLIB := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/glibidl/*/glibidl/gcc335)))
  endif
  VBOX_PATH_LIBIDL ?= $(VBOX_PATH_GLIB)
@@ -469,9 +467,9 @@
  endif
  xpidl_INCS = \
-	$(VBOX_PATH_LIBIDL)/include \
-	$(VBOX_PATH_GLIB)/include
+ 	$(VBOX_PATH_LIBIDL)/include \
+ 	$(VBOX_PATH_GLIB)/include
  xpidl_LIBS = \
-	$(VBOX_PATH_LIBIDL)/lib/libidl.lib \
-	$(VBOX_PATH_LIBIDL)/lib/glib.lib
+ 	$(VBOX_PATH_LIBIDL)/lib/libidl.lib \
+ 	$(VBOX_PATH_LIBIDL)/lib/glib.lib
  # install necessary DLLs to the same place where xpidl goes
  INSTALLS += xpidl-DLLS
@@ -487,16 +485,16 @@
  libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
  xpidl_CFLAGS = \
-	$(libIDL_config_cflags)
+ 	$(libIDL_config_cflags)
  if1of ($(KBUILD_HOST), linux solaris)
   xpidl_LDFLAGS = \
-	$(filter-out -l%,$(libIDL_config_libs))
+  	$(filter-out -l%,$(libIDL_config_libs))
   xpidl_LIBS.$(KBUILD_HOST) += \
-	$(subst -l,,$(filter -l%,$(libIDL_config_libs)))
+  	$(subst -l,,$(filter -l%,$(libIDL_config_libs)))
  else
   xpidl_LDFLAGS = \
-	$(libIDL_config_libs)
+  	$(libIDL_config_libs)
  endif
  xpidl_LDFLAGS.linux = \
-	$(VBOX_LD_as_needed)
+ 	$(VBOX_LD_as_needed)
 endif
 
@@ -626,15 +624,15 @@
 
 ifeq ($(filter-out darwin freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # unixish
-VBox-xpcom-nspr_SOURCES += \
-	nsprpub/pr/src/md/unix/unix.c \
-	nsprpub/pr/src/md/unix/unix_errors.c \
-	nsprpub/pr/src/md/unix/uxproces.c \
-	nsprpub/pr/src/md/unix/uxrng.c \
-	nsprpub/pr/src/md/unix/uxshm.c \
-	nsprpub/pr/src/md/unix/uxwrap.c \
-	nsprpub/pr/src/pthreads/ptio.c \
-	nsprpub/pr/src/pthreads/ptsynch.c \
-	nsprpub/pr/src/pthreads/ptthread.c \
-	nsprpub/pr/src/pthreads/ptmisc.c
+ VBox-xpcom-nspr_SOURCES += \
+ 	nsprpub/pr/src/md/unix/unix.c \
+ 	nsprpub/pr/src/md/unix/unix_errors.c \
+ 	nsprpub/pr/src/md/unix/uxproces.c \
+ 	nsprpub/pr/src/md/unix/uxrng.c \
+ 	nsprpub/pr/src/md/unix/uxshm.c \
+ 	nsprpub/pr/src/md/unix/uxwrap.c \
+ 	nsprpub/pr/src/pthreads/ptio.c \
+ 	nsprpub/pr/src/pthreads/ptsynch.c \
+ 	nsprpub/pr/src/pthreads/ptthread.c \
+ 	nsprpub/pr/src/pthreads/ptmisc.c
 endif
 
@@ -826,6 +824,6 @@
 	xpcom/MoreFiles/MoreFilesX.c
 if1of ($(KBUILD_TARGET) $(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd linux netbsd openbsd solaris darwin.amd64 darwin.arm64)
-VBox-xpcom-io_SOURCES += \
-	xpcom/io/nsLocalFileUnix.cpp
+ VBox-xpcom-io_SOURCES += \
+ 	xpcom/io/nsLocalFileUnix.cpp
 endif
 VBox-xpcom-io_SOURCES.os2 = \
@@ -885,23 +883,23 @@
 VBox-xpcom-xptcall_SOURCES               = xpcom/reflect/xptcall/src/xptcall.cpp
 VBox-xpcom-xptcall_SOURCES.darwin.x86    = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp \
-                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
+	xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
 VBox-xpcom-xptcall_SOURCES.freebsd.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
-                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
+	xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
 VBox-xpcom-xptcall_SOURCES.linux.x86     = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp \
-                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
+	xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
 VBox-xpcom-xptcall_SOURCES.os2           = xpcom/reflect/xptcall/src/md/os2/xptcinvoke_gcc_x86_os2.cpp \
-                                           xpcom/reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp
+	xpcom/reflect/xptcall/src/md/os2/xptcstubs_gcc_x86_os2.cpp
 VBox-xpcom-xptcall_SOURCES.solaris.x86   = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp \
-                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
+	xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
 VBox-xpcom-xptcall_SOURCES.amd64         = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_vbox.asm
 VBox-xpcom-xptcall_SOURCES.arm64         = xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm64_vbox.cpp \
-                                           xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm64_vbox.cpp
+	xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm64_vbox.cpp
 VBox-xpcom-xptcall_SOURCES.darwin.amd64  = xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_darwin.cpp # Underscore prefix.
 VBox-xpcom-xptcall_SOURCES.freebsd.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
 VBox-xpcom-xptcall_SOURCES.linux.amd64   = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
 ifndef VBOX_GCC_USING_SOLARIS_AS
-VBox-xpcom-xptcall_SOURCES.solaris.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
+ VBox-xpcom-xptcall_SOURCES.solaris.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
 else
-VBox-xpcom-xptcall_SOURCES.solaris.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
+ VBox-xpcom-xptcall_SOURCES.solaris.amd64 = xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
 endif
 
@@ -919,9 +917,9 @@
 VBox-xpcom-proxy_DEFS     = _IMPL_NS_COM EXPORT_XPTC_API EXPORT_XPTI_API
 VBox-xpcom-proxy_SOURCES  = \
-    xpcom/proxy/src/nsProxyEvent.cpp \
-    xpcom/proxy/src/nsProxyEventClass.cpp \
-    xpcom/proxy/src/nsProxyEventObject.cpp \
-    xpcom/proxy/src/nsProxyObjectManager.cpp \
-    xpcom/proxy/src/nsProxyRelease.cpp
+	xpcom/proxy/src/nsProxyEvent.cpp \
+	xpcom/proxy/src/nsProxyEventClass.cpp \
+	xpcom/proxy/src/nsProxyEventObject.cpp \
+	xpcom/proxy/src/nsProxyObjectManager.cpp \
+	xpcom/proxy/src/nsProxyRelease.cpp
 $(evalcall VBOX_XPCOM_X86,VBox-xpcom-proxy)
 
@@ -980,5 +978,5 @@
  VBoxXPCOM_LNK_DEPS.linux  += $(XPCOM_C_NAMESPACE_MAP)
  VBoxXPCOM_LDFLAGS.solaris  = -Wl,-M,$(XPCOM_C_NAMESPACE_MAP)
- VBoxXPCOM_LNK_DEPS.solaris+= $(XPCOM_C_NAMESPACE_MAP)
+ VBoxXPCOM_LNK_DEPS.solaris += $(XPCOM_C_NAMESPACE_MAP)
 endif
 VBoxXPCOM_SOURCES = \
@@ -1008,18 +1006,18 @@
 
 ifeq ($(filter-out freebsd linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
-VBoxXPCOM_LDFLAGS = -Wl,--whole-archive \
-	$(VBox-xpcom-typelib_1_TARGET) \
-	$(VBox-xpcom-string_1_TARGET) \
-	$(VBox-xpcom-base_1_TARGET) \
-	$(VBox-xpcom-ds_1_TARGET) \
-	$(VBox-xpcom-io_1_TARGET) \
-	$(VBox-xpcom-components_1_TARGET) \
-	$(VBox-xpcom-threads_1_TARGET) \
-	$(VBox-xpcom-xptinfo_1_TARGET) \
-	$(VBox-xpcom-xptcall_1_TARGET) \
-	$(VBox-xpcom-proxy_1_TARGET) \
-	$(VBox-xpcom-nspr_1_TARGET) \
-	$(VBoxXPCOMGlue_s_1_TARGET) \
-	-Wl,--no-whole-archive
+ VBoxXPCOM_LDFLAGS = -Wl,--whole-archive \
+ 	$(VBox-xpcom-typelib_1_TARGET) \
+ 	$(VBox-xpcom-string_1_TARGET) \
+ 	$(VBox-xpcom-base_1_TARGET) \
+ 	$(VBox-xpcom-ds_1_TARGET) \
+ 	$(VBox-xpcom-io_1_TARGET) \
+ 	$(VBox-xpcom-components_1_TARGET) \
+ 	$(VBox-xpcom-threads_1_TARGET) \
+ 	$(VBox-xpcom-xptinfo_1_TARGET) \
+ 	$(VBox-xpcom-xptcall_1_TARGET) \
+ 	$(VBox-xpcom-proxy_1_TARGET) \
+ 	$(VBox-xpcom-nspr_1_TARGET) \
+ 	$(VBoxXPCOMGlue_s_1_TARGET) \
+ 	-Wl,--no-whole-archive
 endif
 
@@ -1065,18 +1063,18 @@
 
 ifeq ($(filter-out freebsd linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
-VBoxXPCOM-x86_LDFLAGS = -Wl,--whole-archive \
-	$(VBox-xpcom-typelib-x86_1_TARGET) \
-	$(VBox-xpcom-string-x86_1_TARGET) \
-	$(VBox-xpcom-base-x86_1_TARGET) \
-	$(VBox-xpcom-ds-x86_1_TARGET) \
-	$(VBox-xpcom-io-x86_1_TARGET) \
-	$(VBox-xpcom-components-x86_1_TARGET) \
-	$(VBox-xpcom-threads-x86_1_TARGET) \
-	$(VBox-xpcom-xptinfo-x86_1_TARGET) \
-	$(VBox-xpcom-xptcall-x86_1_TARGET) \
-	$(VBox-xpcom-proxy-x86_1_TARGET) \
-	$(VBox-xpcom-nspr-x86_1_TARGET) \
-	$(VBoxXPCOMGlue_s-x86_1_TARGET) \
-	-Wl,--no-whole-archive
+ VBoxXPCOM-x86_LDFLAGS = -Wl,--whole-archive \
+ 	$(VBox-xpcom-typelib-x86_1_TARGET) \
+ 	$(VBox-xpcom-string-x86_1_TARGET) \
+ 	$(VBox-xpcom-base-x86_1_TARGET) \
+ 	$(VBox-xpcom-ds-x86_1_TARGET) \
+ 	$(VBox-xpcom-io-x86_1_TARGET) \
+ 	$(VBox-xpcom-components-x86_1_TARGET) \
+ 	$(VBox-xpcom-threads-x86_1_TARGET) \
+ 	$(VBox-xpcom-xptinfo-x86_1_TARGET) \
+ 	$(VBox-xpcom-xptcall-x86_1_TARGET) \
+ 	$(VBox-xpcom-proxy-x86_1_TARGET) \
+ 	$(VBox-xpcom-nspr-x86_1_TARGET) \
+ 	$(VBoxXPCOMGlue_s-x86_1_TARGET) \
+ 	-Wl,--no-whole-archive
 endif
 
@@ -1101,7 +1099,7 @@
 #
 ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
-$(call VBOX_GENERATE_IMPORT_TARGET_FN,VBoxXPCOMImp,VBoxXPCOM,VBoxXPCOM-mangled.def)
+ $(call VBOX_GENERATE_IMPORT_TARGET_FN,VBoxXPCOMImp,VBoxXPCOM,VBoxXPCOM-mangled.def)
 else
-$(call VBOX_GENERATE_IMPORT_TARGET_FN,VBoxXPCOMImp,VBoxXPCOM,VBoxXPCOM.def)
+ $(call VBOX_GENERATE_IMPORT_TARGET_FN,VBoxXPCOMImp,VBoxXPCOM,VBoxXPCOM.def)
 endif
 
@@ -1111,7 +1109,7 @@
 #
 ifdef VBOX_IPC_RELEASE_LOG
-IPC_LOGGING = 1
+ IPC_LOGGING = 1
 else ifneq ($(KBUILD_TYPE),release)
-IPC_LOGGING = 1
+ IPC_LOGGING = 1
 endif
 
@@ -1179,23 +1177,23 @@
 	ipc/ipcd/client/src/ipcService.cpp \
 	ipc/ipcd/client/src/ipcModuleFactory.cpp \
-	ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp\
-    \
+	ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp \
+	\
 	ipc/ipcd/util/src/ipcMessageReader.cpp \
 	ipc/ipcd/util/src/ipcMessageWriter.cpp \
-    \
+	\
 	ipc/ipcd/extensions/lock/src/ipcLockProtocol.cpp \
 	ipc/ipcd/extensions/lock/src/ipcLockService.cpp \
-    \
+	\
 	ipc/ipcd/extensions/transmngr/src/tmTransactionService.cpp \
-    \
+	\
 	ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp \
 	ipc/ipcd/extensions/transmngr/common/tmVector.cpp
 
 ifeq ($(KBUILD_TARGET),win)
-VBoxXPCOMIPCC_SOURCES += \
-	ipc/ipcd/client/src/ipcConnectionWin.cpp
+ VBoxXPCOMIPCC_SOURCES += \
+ 	ipc/ipcd/client/src/ipcConnectionWin.cpp
 else
-VBoxXPCOMIPCC_SOURCES += \
-	ipc/ipcd/client/src/ipcConnectionUnix.cpp
+ VBoxXPCOMIPCC_SOURCES += \
+ 	ipc/ipcd/client/src/ipcConnectionUnix.cpp
 endif
 VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxXPCOMIPCC.dylib
@@ -1220,8 +1218,8 @@
 ifeq ($(KBUILD_TARGET),win)
  VBoxXPCOMIPCD_SOURCES += \
-	ipc/ipcd/daemon/src/ipcdWin.cpp
+ 	ipc/ipcd/daemon/src/ipcdWin.cpp
 else
  VBoxXPCOMIPCD_SOURCES += \
-	ipc/ipcd/daemon/src/ipcdUnix.cpp
+ 	ipc/ipcd/daemon/src/ipcdUnix.cpp
 endif
 
@@ -1269,5 +1267,5 @@
 tstTestID_TEMPLATE             = XPComTstExe
 tstTestID_SOURCES              = xpcom/tests/TestID.cpp
-tstTestObserverService_TEMPLATE= XPComTstExe
+tstTestObserverService_TEMPLATE = XPComTstExe
 tstTestObserverService_SOURCES = xpcom/tests/TestObserverService.cpp
 tstTestPermanentAtoms_TEMPLATE = XPComTstExe
@@ -1426,9 +1424,9 @@
 # @param idl     The filename with everything.
 define def_IDL
-$(VBOX_PATH_SDK)/bindings/xpcom/include/$(notdir $(subst .idl,.h,$(idl))) \
-+ $(PATH_TARGET)/VBox-xpcom-xpt-files/$(notdir $(subst .idl,.xpt,$(idl))): \
-		$(VBOX_PATH_XPCOM_SRC)/$(idl) \
-		| $$$$(xpidl_1_TARGET) \
-		$(PATH_TARGET)/VBox-xpcom-xpt-files/
+ $(VBOX_PATH_SDK)/bindings/xpcom/include/$(notdir $(subst .idl,.h,$(idl))) \
+ + $(PATH_TARGET)/VBox-xpcom-xpt-files/$(notdir $(subst .idl,.xpt,$(idl))): \
+ 		$(VBOX_PATH_XPCOM_SRC)/$(idl) \
+ 		| $$$$(xpidl_1_TARGET) \
+ 		$(PATH_TARGET)/VBox-xpcom-xpt-files/
 	$$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@)
 	$$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/xpcom/include $(VBOX_PATH_SDK)/bindings/xpcom/idl
Index: trunk/src/libs/xpcom18a4/java/Makefile.kmk
===================================================================
--- trunk/src/libs/xpcom18a4/java/Makefile.kmk	(revision 98391)
+++ trunk/src/libs/xpcom18a4/java/Makefile.kmk	(revision 98394)
@@ -40,49 +40,46 @@
 
 ifndef VBOX_ONLY_SDK
-#
-# VBoxJXpcom - Java<->XPCOM native library
-#
-DLLS += VBoxJXpcom
-
-VBoxJXpcom_TEMPLATE = XPComDll
-VBoxJXpcom_CXXFLAGS = -Wno-write-strings
-VBoxJXpcom_DEFS     = \
-	EXPORT_XPTI_API \
-	EXPORT_XPT_API \
-	VBOX_WITH_XPCOM
-VBoxJXpcom_NAME     = libvboxjxpcom
-VBoxJXpcom_DLLSUFF.darwin = .jnilib
-VBoxJXpcom_INCS     = \
-	src \
-	$(VBOX_JAVA_INC) \
-	$(VBOX_PATH_XPCOM_SRC)/xpcom/glue \
-	$(VBOX_PATH_XPCOM_SRC)/xpcom/build \
-	$(VBOX_JXPCOM_JDEST)
-VBoxJXpcom_SOURCES  = \
-	src/nsAppFileLocProviderProxy.cpp \
-	src/nsJavaWrapper.cpp \
-	src/nsJavaXPCOMBindingUtils.cpp \
-	src/nsJavaXPTCStub.cpp \
-	src/nsJavaXPTCStubWeakRef.cpp \
-	src/nsJavaXPCOMGlue.cpp \
-	src/nsJavaInterfaces.cpp
-VBoxJXpcom_LIBS     = \
-	$(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
-	$(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
-
-#VBoxJXpcom_ORDERDEPS = $(VBOX_JXPCOM_GENH)
-#VBoxJXpcom_CLEAN     = $(VBOX_JXPCOM_GENH)
-VBOX_JXPCOM_GENH = \
-	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_XPCOMImpl.h \
-	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_GREImpl.h \
-	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_MozillaImpl.h \
-	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_XPCOMJavaProxy.h \
-	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_JavaXPCOMMethods.h \
-	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_ProfileLock.h
-
-
-else # VBOX_ONLY_SDK
-# Nothing yet
-endif # VBOX_ONLY_SDK
+ #
+ # VBoxJXpcom - Java<->XPCOM native library
+ #
+ DLLS += VBoxJXpcom
+
+ VBoxJXpcom_TEMPLATE = XPComDll
+ VBoxJXpcom_CXXFLAGS = -Wno-write-strings
+ VBoxJXpcom_DEFS    = \
+ 	EXPORT_XPTI_API \
+ 	EXPORT_XPT_API \
+ 	VBOX_WITH_XPCOM
+ VBoxJXpcom_NAME    = libvboxjxpcom
+ VBoxJXpcom_DLLSUFF.darwin = .jnilib
+ VBoxJXpcom_INCS    = \
+ 	src \
+ 	$(VBOX_JAVA_INC) \
+ 	$(VBOX_PATH_XPCOM_SRC)/xpcom/glue \
+ 	$(VBOX_PATH_XPCOM_SRC)/xpcom/build \
+ 	$(VBOX_JXPCOM_JDEST)
+ VBoxJXpcom_SOURCES = \
+ 	src/nsAppFileLocProviderProxy.cpp \
+ 	src/nsJavaWrapper.cpp \
+ 	src/nsJavaXPCOMBindingUtils.cpp \
+ 	src/nsJavaXPTCStub.cpp \
+ 	src/nsJavaXPTCStubWeakRef.cpp \
+ 	src/nsJavaXPCOMGlue.cpp \
+ 	src/nsJavaInterfaces.cpp
+ VBoxJXpcom_LIBS    = \
+ 	$(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
+ 	$(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
+
+ #VBoxJXpcom_ORDERDEPS = $(VBOX_JXPCOM_GENH)
+ #VBoxJXpcom_CLEAN     = $(VBOX_JXPCOM_GENH)
+ VBOX_JXPCOM_GENH = \
+ 	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_XPCOMImpl.h \
+ 	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_GREImpl.h \
+ 	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_MozillaImpl.h \
+ 	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_XPCOMJavaProxy.h \
+ 	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_internal_JavaXPCOMMethods.h \
+ 	$(VBOX_JXPCOM_JDEST)/org_mozilla_xpcom_ProfileLock.h
+
+endif # !VBOX_ONLY_SDK
 
 #
@@ -94,7 +91,7 @@
 VBOX_JXPCOM_NSERROR = $(VBOX_JXPCOM_GEN)/java/XPCOMError.java
 ifndef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
-VBOX_JXPCOM_GEN     = $(VBOX_JXPCOM_TARGET)/jxpcomgen
+ VBOX_JXPCOM_GEN    = $(VBOX_JXPCOM_TARGET)/jxpcomgen
 else
-VBOX_JXPCOM_GEN     = $(VBOX_JXPCOM_TARGET)/jxpcomgen-idl
+ VBOX_JXPCOM_GEN    = $(VBOX_JXPCOM_TARGET)/jxpcomgen-idl
 endif
 
@@ -106,15 +103,15 @@
 	$(VBOX_JXPCOM_JAR) \
 	$(VBOX_JXPCOM_NSERROR) \
-	$(VBOX_JXPCOM_GEN)/jxpcomgen.list  \
+	$(VBOX_JXPCOM_GEN)/jxpcomgen.list \
 	$(VBOX_JXPCOM_GEN)/jxpcomglue.list \
 	$(wildcard \
-		$(VBOX_JXPCOM_GEN)/java/*.java \
-                $(VBOX_JXPCOM_GEN)/java/glue/*.java \
-		$(VBOX_JXPCOM_JDEST)/*.class \
-		$(VBOX_JXPCOM_JDEST)/*/*.class \
-		$(VBOX_JXPCOM_JDEST)/*/*/*.class \
-		$(VBOX_JXPCOM_JDEST)/*/*/*/*.class \
-		$(VBOX_JXPCOM_JDEST)/*/*/*/*/*.class \
-		$(VBOX_JXPCOM_JDEST)/*/*/*/*/*/*.class \
+	$(VBOX_JXPCOM_GEN)/java/*.java \
+	$(VBOX_JXPCOM_GEN)/java/glue/*.java \
+	$(VBOX_JXPCOM_JDEST)/*.class \
+	$(VBOX_JXPCOM_JDEST)/*/*.class \
+	$(VBOX_JXPCOM_JDEST)/*/*/*.class \
+	$(VBOX_JXPCOM_JDEST)/*/*/*/*.class \
+	$(VBOX_JXPCOM_JDEST)/*/*/*/*/*.class \
+	$(VBOX_JXPCOM_JDEST)/*/*/*/*/*/*.class \
 	)
 VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java $(VBOX_JXPCOM_GEN)/java/glue $(VBOX_JXPCOM_GEN)/java/interfaces
@@ -141,13 +138,13 @@
 
 ifndef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
-#
-# Generate .java interface files from .xidl
-#
-
-$(VBOX_JXPCOM_GEN)/jxpcomgen.list: \
-               $(VBOX_XIDL_FILE)   \
-               $(VBOX_FILESPLIT)   \
-               $(VBOX_JXPCOM_SRC)/tools/genjifaces.xsl \
-               | $(VBOX_JXPCOM_GEN)/java/interfaces/
+ #
+ # Generate .java interface files from .xidl
+ #
+
+ $(VBOX_JXPCOM_GEN)/jxpcomgen.list: \
+ 		$(VBOX_XIDL_FILE) \
+ 		$(VBOX_FILESPLIT) \
+ 		$(VBOX_JXPCOM_SRC)/tools/genjifaces.xsl \
+ 		| $(VBOX_JXPCOM_GEN)/java/interfaces/
 	$(call MSG_L1,Generating Java interface files)
 	$(QUIET)$(RM) -f $(wildcard $(VBOX_JXPCOM_GEN)/java/interfaces/*.java)
@@ -158,15 +155,15 @@
 
 else  # VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
-#
-# Generate .java interface files from the XPCOM and VirtualBox IDL files.
-#
-# Note! There is not a 1:1 relationship between input and output files here, unfortunately.
-# Note! VBOX_JXPCOM_NSERROR shares the output directory with us.
-#
-$(VBOX_JXPCOM_GEN)/jxpcomgen.list: \
-		$(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl \
-		$$(addprefix $(VBOX_PATH_XPCOM_SRC)/,$$(XPCOM_IDLFILES)) \
-		$(VBOX_XPIDL) \
-		| $(VBOX_JXPCOM_GEN)/java/
+ #
+ # Generate .java interface files from the XPCOM and VirtualBox IDL files.
+ #
+ # Note! There is not a 1:1 relationship between input and output files here, unfortunately.
+ # Note! VBOX_JXPCOM_NSERROR shares the output directory with us.
+ #
+ $(VBOX_JXPCOM_GEN)/jxpcomgen.list: \
+ 		$(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl \
+ 		$$(addprefix $(VBOX_PATH_XPCOM_SRC)/,$$(XPCOM_IDLFILES)) \
+ 		$(VBOX_XPIDL) \
+ 		| $(VBOX_JXPCOM_GEN)/java/
 	$(call MSG_L1,Generating XPCOM Java interface files from IDL)
 	$(QUIET)$(RM) -f $(filter-out %/XPCOMError.java, $(wildcard $(VBOX_JXPCOM_GEN)/java/*.java))
@@ -176,8 +173,8 @@
 endif # VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
 
-$(VBOX_JXPCOM_GEN)/jxpcomglue.list:  \
-		$(VBOX_XIDL_FILE)    \
-                $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \
-                $(VBOX_FILESPLIT)    \
+$(VBOX_JXPCOM_GEN)/jxpcomglue.list: \
+		$(VBOX_XIDL_FILE) \
+		$(VBOX_GLUE_XSLT_DIR)/glue-java.xsl \
+		$(VBOX_FILESPLIT) \
 		| $(VBOX_JXPCOM_GEN)/java/glue/
 	$(call MSG_L1,Generating Java glue files from XIDL)
Index: trunk/src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- trunk/src/libs/xpcom18a4/python/Makefile.kmk	(revision 98391)
+++ trunk/src/libs/xpcom18a4/python/Makefile.kmk	(revision 98394)
@@ -89,635 +89,635 @@
 ifndef VBOX_ONLY_SDK
 
-#
-# Base Python Client Module - the C++/XPCOM bits (not actually built).
-#
-VBoxPythonBase_TEMPLATE = XPComDll
-VBoxPythonBase_CXXFLAGS = -Wno-write-strings
-VBoxPythonBase_CXXFLAGS.solaris = $(VBOX_GCC_Wno-unknown-pragmas) # /usr/include/python[23].[75]*/ceval.h:67: warning: ignoring #pragma no_inline(PyEval_EvalFrameEx)
-VBoxPythonBase_DLLSUFF.darwin = .so
-VBoxPythonBase_DEFS     = \
-	_IMPL_NS_COM \
-	_IMPL_NS_BASE \
-	EXPORT_XPTI_API \
-	EXPORT_XPT_API \
-	VBOX_PYXPCOM \
-	VBOX_WITH_XPCOM \
-	VBOX_PYXPCOM_VERSIONED
-#VBoxPythonBase_DEFS.debug = \
-#	VBOX_DEBUG_LIFETIMES
-VBoxPythonBase_INCS     = \
-	src
-VBoxPythonBase_SOURCES  = \
-	src/module/_xpcom.cpp \
-	src/dllmain.cpp \
-	src/ErrorUtils.cpp \
-	src/PyGBase.cpp \
-	src/PyGInputStream.cpp \
-	src/PyGModule.cpp \
-	src/PyGStub.cpp \
-	src/PyGWeakReference.cpp \
-	src/PyIClassInfo.cpp \
-	src/PyIComponentManager.cpp \
-	src/PyIComponentManagerObsolete.cpp \
-	src/PyIEnumerator.cpp \
-	src/PyIID.cpp \
-	src/PyIInputStream.cpp \
-	src/PyIInterfaceInfo.cpp \
-	src/PyIInterfaceInfoManager.cpp \
-	src/PyISimpleEnumerator.cpp \
-	src/PyISupports.cpp \
-	src/PyIVariant.cpp \
-	src/Pyxpt_info.cpp \
-	src/TypeObject.cpp \
-	src/VariantUtils.cpp
-VBoxPythonBase_LIBS     = \
-	$(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
-	$(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
-
-# pymalloc abi variant.
-VBoxPythonBase_m_EXTENDS    = VBoxPythonBase
-VBoxPythonBase_m_DEFS       = MODULE_NAME_SUFFIX=m $(VBoxPythonBase_DEFS)
-
-# 32-bit base.
-VBoxPythonBase_x86_TEMPLATE = XPComDll-x86
-VBoxPythonBase_x86_EXTENDS  = VBoxPythonBase
-VBoxPythonBase_x86_DEFS     = MODULE_NAME_SUFFIX=_x86 $(VBoxPythonBase_DEFS)
-VBoxPythonBase_x86_LIBS     = \
-	$(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB) \
-	$(PATH_STAGE_BIN)/VBoxXPCOM-x86$(VBOX_SUFF_DLL)
-
-# 32-bit pymalloc abi variant.
-VBoxPythonBase_x86_m_EXTENDS    = VBoxPythonBase_x86
-VBoxPythonBase_x86_m_DEFS       = MODULE_NAME_SUFFIX=_x86m $(VBoxPythonBase_DEFS)
-
-
-ifdef VBOX_PYTHON26_INC
-#
-# Python 2.6 version
-#
-DLLS += VBoxPython2_6
-VBoxPython2_6_EXTENDS    = VBoxPythonBase
-VBoxPython2_6_EXTENDS_BY = appending
- ifdef KMK_WITH_VERSION_COMPARE
-VBoxPython2_6_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,)
- else
-VBoxPython2_6_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,)
- endif
-VBoxPython2_6_INCS       = $(VBOX_PYTHON26_INC)
-VBoxPython2_6_LIBS       = $(VBOX_PYTHON26_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON26_LIB_X86
-DLLS += VBoxPython2_6_x86
-VBoxPython2_6_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython2_6_x86_EXTENDS_BY = appending
-   ifdef KMK_WITH_VERSION_COMPARE
-VBoxPython2_6_x86_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,-x86)
+ #
+ # Base Python Client Module - the C++/XPCOM bits (not actually built).
+ #
+ VBoxPythonBase_TEMPLATE = XPComDll
+ VBoxPythonBase_CXXFLAGS = -Wno-write-strings
+ VBoxPythonBase_CXXFLAGS.solaris = $(VBOX_GCC_Wno-unknown-pragmas) # /usr/include/python[23].[75]*/ceval.h:67: warning: ignoring #pragma no_inline(PyEval_EvalFrameEx)
+ VBoxPythonBase_DLLSUFF.darwin = .so
+ VBoxPythonBase_DEFS    = \
+ 	_IMPL_NS_COM \
+ 	_IMPL_NS_BASE \
+ 	EXPORT_XPTI_API \
+ 	EXPORT_XPT_API \
+ 	VBOX_PYXPCOM \
+ 	VBOX_WITH_XPCOM \
+ 	VBOX_PYXPCOM_VERSIONED
+ #VBoxPythonBase_DEFS.debug = \
+ #	VBOX_DEBUG_LIFETIMES
+ VBoxPythonBase_INCS    = \
+ 	src
+ VBoxPythonBase_SOURCES = \
+ 	src/module/_xpcom.cpp \
+ 	src/dllmain.cpp \
+ 	src/ErrorUtils.cpp \
+ 	src/PyGBase.cpp \
+ 	src/PyGInputStream.cpp \
+ 	src/PyGModule.cpp \
+ 	src/PyGStub.cpp \
+ 	src/PyGWeakReference.cpp \
+ 	src/PyIClassInfo.cpp \
+ 	src/PyIComponentManager.cpp \
+ 	src/PyIComponentManagerObsolete.cpp \
+ 	src/PyIEnumerator.cpp \
+ 	src/PyIID.cpp \
+ 	src/PyIInputStream.cpp \
+ 	src/PyIInterfaceInfo.cpp \
+ 	src/PyIInterfaceInfoManager.cpp \
+ 	src/PyISimpleEnumerator.cpp \
+ 	src/PyISupports.cpp \
+ 	src/PyIVariant.cpp \
+ 	src/Pyxpt_info.cpp \
+ 	src/TypeObject.cpp \
+ 	src/VariantUtils.cpp
+ VBoxPythonBase_LIBS    = \
+ 	$(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
+ 	$(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
+
+ # pymalloc abi variant.
+ VBoxPythonBase_m_EXTENDS   = VBoxPythonBase
+ VBoxPythonBase_m_DEFS      = MODULE_NAME_SUFFIX=m $(VBoxPythonBase_DEFS)
+
+ # 32-bit base.
+ VBoxPythonBase_x86_TEMPLATE = XPComDll-x86
+ VBoxPythonBase_x86_EXTENDS = VBoxPythonBase
+ VBoxPythonBase_x86_DEFS    = MODULE_NAME_SUFFIX=_x86 $(VBoxPythonBase_DEFS)
+ VBoxPythonBase_x86_LIBS    = \
+ 	$(PATH_STAGE_LIB)/VBoxCOM-x86$(VBOX_SUFF_LIB) \
+ 	$(PATH_STAGE_BIN)/VBoxXPCOM-x86$(VBOX_SUFF_DLL)
+
+ # 32-bit pymalloc abi variant.
+ VBoxPythonBase_x86_m_EXTENDS   = VBoxPythonBase_x86
+ VBoxPythonBase_x86_m_DEFS      = MODULE_NAME_SUFFIX=_x86m $(VBoxPythonBase_DEFS)
+
+
+ ifdef VBOX_PYTHON26_INC
+  #
+  # Python 2.6 version
+  #
+  DLLS += VBoxPython2_6
+  VBoxPython2_6_EXTENDS  = VBoxPythonBase
+  VBoxPython2_6_EXTENDS_BY = appending
+  ifdef KMK_WITH_VERSION_COMPARE
+   VBoxPython2_6_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,)
+  else
+   VBoxPython2_6_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,)
+  endif
+  VBoxPython2_6_INCS     = $(VBOX_PYTHON26_INC)
+  VBoxPython2_6_LIBS     = $(VBOX_PYTHON26_LIB)
+
+  ifdef VBOX_WITH_32_ON_64_MAIN_API
+   ifdef VBOX_PYTHON26_LIB_X86
+    DLLS += VBoxPython2_6_x86
+    VBoxPython2_6_x86_EXTENDS = VBoxPythonBase_x86
+    VBoxPython2_6_x86_EXTENDS_BY = appending
+    ifdef KMK_WITH_VERSION_COMPARE
+     VBoxPython2_6_x86_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.6",OSX106,-x86)
+    else
+     VBoxPython2_6_x86_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,-x86)
+    endif
+    VBoxPython2_6_x86_INCS   = $(VBOX_PYTHON26_INC)
+    VBoxPython2_6_x86_LIBS   = $(VBOX_PYTHON26_LIB_X86)
+   endif
+  endif
+ endif
+
+ ifdef VBOX_PYTHON27_INC
+  #
+  # Python 2.7 version
+  #
+  DLLS += VBoxPython2_7
+  VBoxPython2_7_EXTENDS  = VBoxPythonBase
+  VBoxPython2_7_EXTENDS_BY = appending
+  ifdef KMK_WITH_VERSION_COMPARE
+   VBoxPython2_7_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,)
+  else
+   VBoxPython2_7_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,)
+  endif
+  VBoxPython2_7_INCS     = $(VBOX_PYTHON27_INC)
+  VBoxPython2_7_LIBS     = $(VBOX_PYTHON27_LIB)
+
+  ifdef VBOX_WITH_32_ON_64_MAIN_API
+   ifdef VBOX_PYTHON27_LIB_X86
+    DLLS += VBoxPython2_7_x86
+    VBoxPython2_7_x86_EXTENDS = VBoxPythonBase_x86
+    VBoxPython2_7_x86_EXTENDS_BY = appending
+    ifdef KMK_WITH_VERSION_COMPARE
+     VBoxPython2_7_x86_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86)
+    else
+     VBoxPython2_7_x86_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,-x86)
+    endif
+    VBoxPython2_7_x86_INCS   = $(VBOX_PYTHON27_INC)
+    VBoxPython2_7_x86_LIBS   = $(VBOX_PYTHON27_LIB_X86)
+   endif
+  endif
+ endif
+
+ #
+ # Unversioned Python 2.x.
+ #
+ if defined(VBOX_PYTHON27_INC) || defined(VBOX_PYTHON26_INC)
+  DLLS += VBoxPython2
+  VBoxPython2_EXTENDS  = VBoxPythonBase
+  VBoxPython2_EXTENDS_BY = appending
+  VBoxPython2_DEFS     = VBOX_PYXPCOM_MAJOR_VERSIONED
+  ifdef KMK_WITH_VERSION_COMPARE
+   VBoxPython2_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,)
+  else
+   VBoxPython2_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,)
+  endif
+  if defined(VBOX_PYTHON26_INC)
+   VBoxPython2_INCS    = $(VBOX_PYTHON26_INC)
+   ifn1of ($(KBUILD_TARGET), linux)
+    VBoxPython2_LIBS   = $(VBOX_PYTHON26_LIB)
+   endif
+  else
+   VBoxPython2_INCS    = $(VBOX_PYTHON27_INC)
+   ifn1of ($(KBUILD_TARGET), linux)
+    VBoxPython2_LIBS   = $(VBOX_PYTHON27_LIB)
+   endif
+  endif
+ endif
+
+ if defined(VBOX_WITH_32_ON_64_MAIN_API) && (defined(VBOX_PYTHON27_LIB_X86) || defined(VBOX_PYTHON26_INC_X86))
+  DLLS += VBoxPython2_x86
+  VBoxPython2_x86_EXTENDS  = VBoxPythonBase_x86
+  VBoxPython2_x86_EXTENDS_BY = appending
+  VBoxPython2_x86_DEFS     = VBOX_PYXPCOM_MAJOR_VERSIONED $(VBoxPythonBase_x86_DEFS)
+  ifdef KMK_WITH_VERSION_COMPARE
+   VBoxPython2_x86_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86)
+  else
+   VBoxPython2_x86_TEMPLATE = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,-x86)
+  endif
+  if defined(VBOX_PYTHON26LIB_X86)
+   VBoxPython2_x86_INCS    = $(VBOX_PYTHON26_INC)
+   ifn1of ($(KBUILD_TARGET), linux)
+    VBoxPython2_x86_LIBS   = $(VBOX_PYTHON26_LIB_X86)
+   endif
+  else
+   VBoxPython2_x86_INCS    = $(VBOX_PYTHON27_INC)
+   ifn1of ($(KBUILD_TARGET), linux)
+    VBoxPython2_x86_LIBS   = $(VBOX_PYTHON27_LIB_X86)
+   endif
+  endif
+ endif
+
+
+ ifdef VBOX_PYTHON31_INC
+  #
+  # Python 3.1 version
+  #
+  DLLS += VBoxPython3_1
+  VBoxPython3_1_EXTENDS  = VBoxPythonBase
+  VBoxPython3_1_EXTENDS_BY = appending
+  VBoxPython3_1_INCS     = $(VBOX_PYTHON31_INC)
+  VBoxPython3_1_LIBS     = $(VBOX_PYTHON31_LIB)
+
+  ifdef VBOX_WITH_32_ON_64_MAIN_API
+   ifdef VBOX_PYTHON31_LIB_X86
+    DLLS += VBoxPython3_1_x86
+    VBoxPython3_1_x86_EXTENDS = VBoxPythonBase_x86
+    VBoxPython3_1_x86_EXTENDS_BY = appending
+    VBoxPython3_1_x86_INCS   = $(VBOX_PYTHON31_INC)
+    VBoxPython3_1_x86_LIBS   = $(VBOX_PYTHON31_LIB_X86)
+   endif
+  endif
+ endif
+
+ ifdef VBOX_PYTHON32_INC
+  #
+  # Python 3.2 version
+  #
+  DLLS += VBoxPython3_2
+  VBoxPython3_2_EXTENDS  = VBoxPythonBase
+  VBoxPython3_2_EXTENDS_BY = appending
+  VBoxPython3_2_INCS     = $(VBOX_PYTHON32_INC)
+  VBoxPython3_2_LIBS     = $(VBOX_PYTHON32_LIB)
+
+  ifdef VBOX_WITH_32_ON_64_MAIN_API
+   ifdef VBOX_PYTHON32_LIB_X86
+    DLLS += VBoxPython3_2_x86
+    VBoxPython3_2_x86_EXTENDS = VBoxPythonBase_x86
+    VBoxPython3_2_x86_EXTENDS_BY = appending
+    VBoxPython3_2_x86_INCS   = $(VBOX_PYTHON32_INC)
+    VBoxPython3_2_x86_LIBS   = $(VBOX_PYTHON32_LIB_X86)
+   endif
+  endif
+ endif
+
+ ifdef VBOX_PYTHON32M_INC
+  #
+  # Python 3.2 version with pymalloc
+  #
+  DLLS += VBoxPython3_2m
+  VBoxPython3_2m_EXTENDS  = VBoxPythonBase_m
+  VBoxPython3_2m_EXTENDS_BY = appending
+  VBoxPython3_2m_INCS     = $(VBOX_PYTHON32M_INC)
+  VBoxPython3_2m_LIBS     = $(VBOX_PYTHON32M_LIB)
+  VBoxPython3_2m_DEFS     = MODULE_NAME_SUFFIX
+
+  ifdef VBOX_WITH_32_ON_64_MAIN_API
+   ifdef VBOX_PYTHON32M_LIB_X86
+    DLLS += VBoxPython3_2m_x86
+    VBoxPython3_2m_x86_EXTENDS = VBoxPythonBase_x86_m
+    VBoxPython3_2m_x86_EXTENDS_BY = appending
+    VBoxPython3_2m_x86_INCS   = $(VBOX_PYTHON32M_INC)
+    VBoxPython3_2m_x86_LIBS   = $(VBOX_PYTHON32M_LIB_X86)
+   endif
+  endif
+ endif
+
+ ifndef VBOX_WITH_ONLY_PYTHON_LIMITED_API
+
+  ifdef VBOX_PYTHON33_INC
+   #
+   # Python 3.3 version
+   #
+   DLLS += VBoxPython3_3
+   VBoxPython3_3_EXTENDS = VBoxPythonBase
+   VBoxPython3_3_EXTENDS_BY = appending
+   VBoxPython3_3_INCS    = $(VBOX_PYTHON33_INC)
+   VBoxPython3_3_LIBS    = $(VBOX_PYTHON33_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON33_LIB_X86
+     DLLS += VBoxPython3_3_x86
+     VBoxPython3_3_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_3_x86_EXTENDS_BY = appending
+     VBoxPython3_3_x86_INCS  = $(VBOX_PYTHON33_INC)
+     VBoxPython3_3_x86_LIBS  = $(VBOX_PYTHON33_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON33M_INC
+   #
+   # Python 3.3 version with pymalloc
+   #
+   DLLS += VBoxPython3_3m
+   VBoxPython3_3m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_3m_EXTENDS_BY = appending
+   VBoxPython3_3m_INCS    = $(VBOX_PYTHON33M_INC)
+   VBoxPython3_3m_LIBS    = $(VBOX_PYTHON33M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON33M_LIB_X86
+     DLLS += VBoxPython3_3m_x86
+     VBoxPython3_3m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_3m_x86_EXTENDS_BY = appending
+     VBoxPython3_3m_x86_INCS  = $(VBOX_PYTHON33M_INC)
+     VBoxPython3_3m_x86_LIBS  = $(VBOX_PYTHON33M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON34_INC
+   #
+   # Python 3.4 version
+   #
+   DLLS += VBoxPython3_4
+   VBoxPython3_4_EXTENDS = VBoxPythonBase
+   VBoxPython3_4_EXTENDS_BY = appending
+   VBoxPython3_4_INCS    = $(VBOX_PYTHON34_INC)
+   VBoxPython3_4_LIBS    = $(VBOX_PYTHON34_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON34_LIB_X86
+     DLLS += VBoxPython3_4_x86
+     VBoxPython3_4_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_4_x86_EXTENDS_BY = appending
+     VBoxPython3_4_x86_INCS  = $(VBOX_PYTHON34_INC)
+     VBoxPython3_4_x86_LIBS  = $(VBOX_PYTHON34_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON34M_INC
+   #
+   # Python 3.4 version with pymalloc
+   #
+   DLLS += VBoxPython3_4m
+   VBoxPython3_4m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_4m_EXTENDS_BY = appending
+   VBoxPython3_4m_INCS    = $(VBOX_PYTHON34M_INC)
+   VBoxPython3_4m_LIBS    = $(VBOX_PYTHON34M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON34M_LIB_X86
+     DLLS += VBoxPython3_4m_x86
+     VBoxPython3_4m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_4m_x86_EXTENDS_BY = appending
+     VBoxPython3_4m_x86_INCS  = $(VBOX_PYTHON34M_INC)
+     VBoxPython3_4m_x86_LIBS  = $(VBOX_PYTHON34M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON35_INC
+   #
+   # Python 3.5 version
+   #
+   DLLS += VBoxPython3_5
+   VBoxPython3_5_EXTENDS = VBoxPythonBase
+   VBoxPython3_5_EXTENDS_BY = appending
+   VBoxPython3_5_INCS    = $(VBOX_PYTHON35_INC)
+   VBoxPython3_5_LIBS    = $(VBOX_PYTHON35_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON35_LIB_X86
+     DLLS += VBoxPython3_5_x86
+     VBoxPython3_5_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_5_x86_EXTENDS_BY = appending
+     VBoxPython3_5_x86_INCS  = $(VBOX_PYTHON35_INC)
+     VBoxPython3_5_x86_LIBS  = $(VBOX_PYTHON35_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON35M_INC
+   #
+   # Python 3.5 version with pymalloc
+   #
+   DLLS += VBoxPython3_5m
+   VBoxPython3_5m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_5m_EXTENDS_BY = appending
+   VBoxPython3_5m_INCS    = $(VBOX_PYTHON35M_INC)
+   VBoxPython3_5m_LIBS    = $(VBOX_PYTHON35M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON35M_LIB_X86
+     DLLS += VBoxPython3_5m_x86
+     VBoxPython3_5m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_5m_x86_EXTENDS_BY = appending
+     VBoxPython3_5m_x86_INCS  = $(VBOX_PYTHON35M_INC)
+     VBoxPython3_5m_x86_LIBS  = $(VBOX_PYTHON35M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON36_INC
+   #
+   # Python 3.6 version
+   #
+   DLLS += VBoxPython3_6
+   VBoxPython3_6_EXTENDS = VBoxPythonBase
+   VBoxPython3_6_EXTENDS_BY = appending
+   VBoxPython3_6_INCS    = $(VBOX_PYTHON36_INC)
+   VBoxPython3_6_LIBS    = $(VBOX_PYTHON36_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON36_LIB_X86
+     DLLS += VBoxPython3_6_x86
+     VBoxPython3_6_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_6_x86_EXTENDS_BY = appending
+     VBoxPython3_6_x86_INCS  = $(VBOX_PYTHON36_INC)
+     VBoxPython3_6_x86_LIBS  = $(VBOX_PYTHON36_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON36M_INC
+   #
+   # Python 3.6 version with pymalloc
+   #
+   DLLS += VBoxPython3_6m
+   VBoxPython3_6m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_6m_EXTENDS_BY = appending
+   VBoxPython3_6m_INCS    = $(VBOX_PYTHON36M_INC)
+   VBoxPython3_6m_LIBS    = $(VBOX_PYTHON36M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON36M_LIB_X86
+     DLLS += VBoxPython3_6m_x86
+     VBoxPython3_6m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_6m_x86_EXTENDS_BY = appending
+     VBoxPython3_6m_x86_INCS  = $(VBOX_PYTHON36M_INC)
+     VBoxPython3_6m_x86_LIBS  = $(VBOX_PYTHON36M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON37_INC
+   #
+   # Python 3.7 version
+   #
+   DLLS += VBoxPython3_7
+   VBoxPython3_7_EXTENDS = VBoxPythonBase
+   VBoxPython3_7_EXTENDS_BY = appending
+   VBoxPython3_7_INCS    = $(VBOX_PYTHON37_INC)
+   VBoxPython3_7_LIBS    = $(VBOX_PYTHON37_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON37_LIB_X86
+     DLLS += VBoxPython3_7_x86
+     VBoxPython3_7_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_7_x86_EXTENDS_BY = appending
+     VBoxPython3_7_x86_INCS  = $(VBOX_PYTHON37_INC)
+     VBoxPython3_7_x86_LIBS  = $(VBOX_PYTHON37_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON37M_INC
+   #
+   # Python 3.7 version with pymalloc
+   #
+   DLLS += VBoxPython3_7m
+   VBoxPython3_7m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_7m_EXTENDS_BY = appending
+   VBoxPython3_7m_INCS    = $(VBOX_PYTHON37M_INC)
+   VBoxPython3_7m_LIBS    = $(VBOX_PYTHON37M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON37M_LIB_X86
+     DLLS += VBoxPython3_7m_x86
+     VBoxPython3_7m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_7m_x86_EXTENDS_BY = appending
+     VBoxPython3_7m_x86_INCS  = $(VBOX_PYTHON37M_INC)
+     VBoxPython3_7m_x86_LIBS  = $(VBOX_PYTHON37M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON38_INC
+   #
+   # Python 3.8 version
+   #
+   DLLS += VBoxPython3_8
+   VBoxPython3_8_EXTENDS = VBoxPythonBase
+   VBoxPython3_8_EXTENDS_BY = appending
+   VBoxPython3_8_INCS    = $(VBOX_PYTHON38_INC)
+   VBoxPython3_8_LIBS    = $(VBOX_PYTHON38_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON38_LIB_X86
+     DLLS += VBoxPython3_8_x86
+     VBoxPython3_8_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_8_x86_EXTENDS_BY = appending
+     VBoxPython3_8_x86_INCS  = $(VBOX_PYTHON38_INC)
+     VBoxPython3_8_x86_LIBS  = $(VBOX_PYTHON38_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON38M_INC
+   #
+   # Python 3.8 version with pymalloc
+   #
+   DLLS += VBoxPython3_8m
+   VBoxPython3_8m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_8m_EXTENDS_BY = appending
+   VBoxPython3_8m_INCS    = $(VBOX_PYTHON38M_INC)
+   VBoxPython3_8m_LIBS    = $(VBOX_PYTHON38M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON38M_LIB_X86
+     DLLS += VBoxPython3_8m_x86
+     VBoxPython3_8m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_8m_x86_EXTENDS_BY = appending
+     VBoxPython3_8m_x86_INCS  = $(VBOX_PYTHON38M_INC)
+     VBoxPython3_8m_x86_LIBS  = $(VBOX_PYTHON38M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON39_INC
+   #
+   # Python 3.9 version
+   #
+   DLLS += VBoxPython3_9
+   VBoxPython3_9_EXTENDS = VBoxPythonBase
+   VBoxPython3_9_EXTENDS_BY = appending
+   VBoxPython3_9_INCS    = $(VBOX_PYTHON39_INC)
+   VBoxPython3_9_LIBS    = $(VBOX_PYTHON39_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON39_LIB_X86
+     DLLS += VBoxPython3_9_x86
+     VBoxPython3_9_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_9_x86_EXTENDS_BY = appending
+     VBoxPython3_9_x86_INCS  = $(VBOX_PYTHON39_INC)
+     VBoxPython3_9_x86_LIBS  = $(VBOX_PYTHON39_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON39M_INC
+   #
+   # Python 3.9 version with pymalloc
+   #
+   DLLS += VBoxPython3_9m
+   VBoxPython3_9m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_9m_EXTENDS_BY = appending
+   VBoxPython3_9m_INCS    = $(VBOX_PYTHON39M_INC)
+   VBoxPython3_9m_LIBS    = $(VBOX_PYTHON39M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON39M_LIB_X86
+     DLLS += VBoxPython3_9m_x86
+     VBoxPython3_9m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_9m_x86_EXTENDS_BY = appending
+     VBoxPython3_9m_x86_INCS  = $(VBOX_PYTHON39M_INC)
+     VBoxPython3_9m_x86_LIBS  = $(VBOX_PYTHON39M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON310_INC
+   #
+   # Python 3.10 version
+   #
+   DLLS += VBoxPython3_10
+   VBoxPython3_10_EXTENDS = VBoxPythonBase
+   VBoxPython3_10_EXTENDS_BY = appending
+   VBoxPython3_10_INCS    = $(VBOX_PYTHON310_INC)
+   VBoxPython3_10_LIBS    = $(VBOX_PYTHON310_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON310_LIB_X86
+     DLLS += VBoxPython3_10_x86
+     VBoxPython3_10_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython3_10_x86_EXTENDS_BY = appending
+     VBoxPython3_10_x86_INCS  = $(VBOX_PYTHON310_INC)
+     VBoxPython3_10_x86_LIBS  = $(VBOX_PYTHON310_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHON310M_INC
+   #
+   # Python 3.10 version with pymalloc
+   #
+   DLLS += VBoxPython3_10m
+   VBoxPython3_10m_EXTENDS = VBoxPythonBase_m
+   VBoxPython3_10m_EXTENDS_BY = appending
+   VBoxPython3_10m_INCS    = $(VBOX_PYTHON310M_INC)
+   VBoxPython3_10m_LIBS    = $(VBOX_PYTHON310M_LIB)
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHON310M_LIB_X86
+     DLLS += VBoxPython3_10m_x86
+     VBoxPython3_10m_x86_EXTENDS = VBoxPythonBase_x86_m
+     VBoxPython3_10m_x86_EXTENDS_BY = appending
+     VBoxPython3_10m_x86_INCS  = $(VBOX_PYTHON310M_INC)
+     VBoxPython3_10m_x86_LIBS  = $(VBOX_PYTHON310M_LIB_X86)
+    endif
+   endif
+  endif
+
+  ifdef VBOX_PYTHONDEF_INC
+   #
+   # Python without versioning
+   #
+   DLLS += VBoxPython
+   VBoxPython_EXTENDS   = VBoxPythonBase
+   VBoxPython_DEFS      = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS))
+   VBoxPython_INCS      = $(VBoxPythonBase_INCS) $(VBOX_PYTHONDEF_INC)
+   if "$(KBUILD_TARGET)" == "linux"
+    VBoxPython_LIBS     = $(VBoxPythonBase_LIBS)
    else
-VBoxPython2_6_x86_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.6",OSX106,-x86)
-   endif
-VBoxPython2_6_x86_INCS       = $(VBOX_PYTHON26_INC)
-VBoxPython2_6_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON27_INC
-#
-# Python 2.7 version
-#
-DLLS += VBoxPython2_7
-VBoxPython2_7_EXTENDS    = VBoxPythonBase
-VBoxPython2_7_EXTENDS_BY = appending
- ifdef KMK_WITH_VERSION_COMPARE
-VBoxPython2_7_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,)
- else
-VBoxPython2_7_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,)
- endif
-VBoxPython2_7_INCS       = $(VBOX_PYTHON27_INC)
-VBoxPython2_7_LIBS       = $(VBOX_PYTHON27_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON27_LIB_X86
-DLLS += VBoxPython2_7_x86
-VBoxPython2_7_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython2_7_x86_EXTENDS_BY = appending
-   ifdef KMK_WITH_VERSION_COMPARE
-VBoxPython2_7_x86_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86)
-   else
-VBoxPython2_7_x86_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,-x86)
-   endif
-VBoxPython2_7_x86_INCS       = $(VBOX_PYTHON27_INC)
-VBoxPython2_7_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)
-  endif
- endif
-endif
-
-#
-# Unversioned Python 2.x.
-#
- if defined(VBOX_PYTHON27_INC) || defined(VBOX_PYTHON26_INC)
-DLLS += VBoxPython2
-VBoxPython2_EXTENDS    = VBoxPythonBase
-VBoxPython2_EXTENDS_BY = appending
-VBoxPython2_DEFS       = VBOX_PYXPCOM_MAJOR_VERSIONED
-  ifdef KMK_WITH_VERSION_COMPARE
-VBoxPython2_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,)
-  else
-VBoxPython2_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,)
-  endif
-  if defined(VBOX_PYTHON26_INC)
-VBoxPython2_INCS       = $(VBOX_PYTHON26_INC)
-   ifn1of ($(KBUILD_TARGET), linux)
-VBoxPython2_LIBS       = $(VBOX_PYTHON26_LIB)
-   endif
-  else
-VBoxPython2_INCS       = $(VBOX_PYTHON27_INC)
-   ifn1of ($(KBUILD_TARGET), linux)
-VBoxPython2_LIBS       = $(VBOX_PYTHON27_LIB)
-   endif
-  endif
- endif
-
- if defined(VBOX_WITH_32_ON_64_MAIN_API) && (defined(VBOX_PYTHON27_LIB_X86) || defined(VBOX_PYTHON26_INC_X86))
-DLLS += VBoxPython2_x86
-VBoxPython2_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython2_x86_EXTENDS_BY = appending
-VBoxPython2_x86_DEFS       = VBOX_PYXPCOM_MAJOR_VERSIONED $(VBoxPythonBase_x86_DEFS)
-  ifdef KMK_WITH_VERSION_COMPARE
-VBoxPython2_x86_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" vle "10.7",OSX107,-x86)
-  else
-VBoxPython2_x86_TEMPLATE   = XPComDll$(if-expr "$(KBUILD_TARGET)" == "darwin" && "$(VBOX_DEF_MACOSX_VERSION_MIN)" <= "10.7" && "$(length-var VBOX_DEF_MACOSX_VERSION_MIN)" == "4",OSX107,-x86)
-  endif
-  if defined(VBOX_PYTHON26LIB_X86)
-VBoxPython2_x86_INCS       = $(VBOX_PYTHON26_INC)
-   ifn1of ($(KBUILD_TARGET), linux)
-VBoxPython2_x86_LIBS       = $(VBOX_PYTHON26_LIB_X86)
-   endif
-  else
-VBoxPython2_x86_INCS       = $(VBOX_PYTHON27_INC)
-   ifn1of ($(KBUILD_TARGET), linux)
-VBoxPython2_x86_LIBS       = $(VBOX_PYTHON27_LIB_X86)
-   endif
-  endif
- endif
-
-
-ifdef VBOX_PYTHON31_INC
-#
-# Python 3.1 version
-#
-DLLS += VBoxPython3_1
-VBoxPython3_1_EXTENDS    = VBoxPythonBase
-VBoxPython3_1_EXTENDS_BY = appending
-VBoxPython3_1_INCS       = $(VBOX_PYTHON31_INC)
-VBoxPython3_1_LIBS       = $(VBOX_PYTHON31_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON31_LIB_X86
-DLLS += VBoxPython3_1_x86
-VBoxPython3_1_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_1_x86_EXTENDS_BY = appending
-VBoxPython3_1_x86_INCS       = $(VBOX_PYTHON31_INC)
-VBoxPython3_1_x86_LIBS       = $(VBOX_PYTHON31_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON32_INC
-#
-# Python 3.2 version
-#
-DLLS += VBoxPython3_2
-VBoxPython3_2_EXTENDS    = VBoxPythonBase
-VBoxPython3_2_EXTENDS_BY = appending
-VBoxPython3_2_INCS       = $(VBOX_PYTHON32_INC)
-VBoxPython3_2_LIBS       = $(VBOX_PYTHON32_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON32_LIB_X86
-DLLS += VBoxPython3_2_x86
-VBoxPython3_2_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_2_x86_EXTENDS_BY = appending
-VBoxPython3_2_x86_INCS       = $(VBOX_PYTHON32_INC)
-VBoxPython3_2_x86_LIBS       = $(VBOX_PYTHON32_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON32M_INC
-#
-# Python 3.2 version with pymalloc
-#
-DLLS += VBoxPython3_2m
-VBoxPython3_2m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_2m_EXTENDS_BY = appending
-VBoxPython3_2m_INCS       = $(VBOX_PYTHON32M_INC)
-VBoxPython3_2m_LIBS       = $(VBOX_PYTHON32M_LIB)
-VBoxPython3_2m_DEFS       = MODULE_NAME_SUFFIX
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON32M_LIB_X86
-DLLS += VBoxPython3_2m_x86
-VBoxPython3_2m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_2m_x86_EXTENDS_BY = appending
-VBoxPython3_2m_x86_INCS       = $(VBOX_PYTHON32M_INC)
-VBoxPython3_2m_x86_LIBS       = $(VBOX_PYTHON32M_LIB_X86)
-  endif
- endif
-endif
-
- ifndef VBOX_WITH_ONLY_PYTHON_LIMITED_API
-
-ifdef VBOX_PYTHON33_INC
-#
-# Python 3.3 version
-#
-DLLS += VBoxPython3_3
-VBoxPython3_3_EXTENDS    = VBoxPythonBase
-VBoxPython3_3_EXTENDS_BY = appending
-VBoxPython3_3_INCS       = $(VBOX_PYTHON33_INC)
-VBoxPython3_3_LIBS       = $(VBOX_PYTHON33_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON33_LIB_X86
-DLLS += VBoxPython3_3_x86
-VBoxPython3_3_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_3_x86_EXTENDS_BY = appending
-VBoxPython3_3_x86_INCS       = $(VBOX_PYTHON33_INC)
-VBoxPython3_3_x86_LIBS       = $(VBOX_PYTHON33_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON33M_INC
-#
-# Python 3.3 version with pymalloc
-#
-DLLS += VBoxPython3_3m
-VBoxPython3_3m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_3m_EXTENDS_BY = appending
-VBoxPython3_3m_INCS       = $(VBOX_PYTHON33M_INC)
-VBoxPython3_3m_LIBS       = $(VBOX_PYTHON33M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON33M_LIB_X86
-DLLS += VBoxPython3_3m_x86
-VBoxPython3_3m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_3m_x86_EXTENDS_BY = appending
-VBoxPython3_3m_x86_INCS       = $(VBOX_PYTHON33M_INC)
-VBoxPython3_3m_x86_LIBS       = $(VBOX_PYTHON33M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON34_INC
-#
-# Python 3.4 version
-#
-DLLS += VBoxPython3_4
-VBoxPython3_4_EXTENDS    = VBoxPythonBase
-VBoxPython3_4_EXTENDS_BY = appending
-VBoxPython3_4_INCS       = $(VBOX_PYTHON34_INC)
-VBoxPython3_4_LIBS       = $(VBOX_PYTHON34_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON34_LIB_X86
-DLLS += VBoxPython3_4_x86
-VBoxPython3_4_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_4_x86_EXTENDS_BY = appending
-VBoxPython3_4_x86_INCS       = $(VBOX_PYTHON34_INC)
-VBoxPython3_4_x86_LIBS       = $(VBOX_PYTHON34_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON34M_INC
-#
-# Python 3.4 version with pymalloc
-#
-DLLS += VBoxPython3_4m
-VBoxPython3_4m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_4m_EXTENDS_BY = appending
-VBoxPython3_4m_INCS       = $(VBOX_PYTHON34M_INC)
-VBoxPython3_4m_LIBS       = $(VBOX_PYTHON34M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON34M_LIB_X86
-DLLS += VBoxPython3_4m_x86
-VBoxPython3_4m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_4m_x86_EXTENDS_BY = appending
-VBoxPython3_4m_x86_INCS       = $(VBOX_PYTHON34M_INC)
-VBoxPython3_4m_x86_LIBS       = $(VBOX_PYTHON34M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON35_INC
-#
-# Python 3.5 version
-#
-DLLS += VBoxPython3_5
-VBoxPython3_5_EXTENDS    = VBoxPythonBase
-VBoxPython3_5_EXTENDS_BY = appending
-VBoxPython3_5_INCS       = $(VBOX_PYTHON35_INC)
-VBoxPython3_5_LIBS       = $(VBOX_PYTHON35_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON35_LIB_X86
-DLLS += VBoxPython3_5_x86
-VBoxPython3_5_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_5_x86_EXTENDS_BY = appending
-VBoxPython3_5_x86_INCS       = $(VBOX_PYTHON35_INC)
-VBoxPython3_5_x86_LIBS       = $(VBOX_PYTHON35_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON35M_INC
-#
-# Python 3.5 version with pymalloc
-#
-DLLS += VBoxPython3_5m
-VBoxPython3_5m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_5m_EXTENDS_BY = appending
-VBoxPython3_5m_INCS       = $(VBOX_PYTHON35M_INC)
-VBoxPython3_5m_LIBS       = $(VBOX_PYTHON35M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON35M_LIB_X86
-DLLS += VBoxPython3_5m_x86
-VBoxPython3_5m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_5m_x86_EXTENDS_BY = appending
-VBoxPython3_5m_x86_INCS       = $(VBOX_PYTHON35M_INC)
-VBoxPython3_5m_x86_LIBS       = $(VBOX_PYTHON35M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON36_INC
-#
-# Python 3.6 version
-#
-DLLS += VBoxPython3_6
-VBoxPython3_6_EXTENDS    = VBoxPythonBase
-VBoxPython3_6_EXTENDS_BY = appending
-VBoxPython3_6_INCS       = $(VBOX_PYTHON36_INC)
-VBoxPython3_6_LIBS       = $(VBOX_PYTHON36_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON36_LIB_X86
-DLLS += VBoxPython3_6_x86
-VBoxPython3_6_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_6_x86_EXTENDS_BY = appending
-VBoxPython3_6_x86_INCS       = $(VBOX_PYTHON36_INC)
-VBoxPython3_6_x86_LIBS       = $(VBOX_PYTHON36_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON36M_INC
-#
-# Python 3.6 version with pymalloc
-#
-DLLS += VBoxPython3_6m
-VBoxPython3_6m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_6m_EXTENDS_BY = appending
-VBoxPython3_6m_INCS       = $(VBOX_PYTHON36M_INC)
-VBoxPython3_6m_LIBS       = $(VBOX_PYTHON36M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON36M_LIB_X86
-DLLS += VBoxPython3_6m_x86
-VBoxPython3_6m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_6m_x86_EXTENDS_BY = appending
-VBoxPython3_6m_x86_INCS       = $(VBOX_PYTHON36M_INC)
-VBoxPython3_6m_x86_LIBS       = $(VBOX_PYTHON36M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON37_INC
-#
-# Python 3.7 version
-#
-DLLS += VBoxPython3_7
-VBoxPython3_7_EXTENDS    = VBoxPythonBase
-VBoxPython3_7_EXTENDS_BY = appending
-VBoxPython3_7_INCS       = $(VBOX_PYTHON37_INC)
-VBoxPython3_7_LIBS       = $(VBOX_PYTHON37_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON37_LIB_X86
-DLLS += VBoxPython3_7_x86
-VBoxPython3_7_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_7_x86_EXTENDS_BY = appending
-VBoxPython3_7_x86_INCS       = $(VBOX_PYTHON37_INC)
-VBoxPython3_7_x86_LIBS       = $(VBOX_PYTHON37_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON37M_INC
-#
-# Python 3.7 version with pymalloc
-#
-DLLS += VBoxPython3_7m
-VBoxPython3_7m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_7m_EXTENDS_BY = appending
-VBoxPython3_7m_INCS       = $(VBOX_PYTHON37M_INC)
-VBoxPython3_7m_LIBS       = $(VBOX_PYTHON37M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON37M_LIB_X86
-DLLS += VBoxPython3_7m_x86
-VBoxPython3_7m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_7m_x86_EXTENDS_BY = appending
-VBoxPython3_7m_x86_INCS       = $(VBOX_PYTHON37M_INC)
-VBoxPython3_7m_x86_LIBS       = $(VBOX_PYTHON37M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON38_INC
-#
-# Python 3.8 version
-#
-DLLS += VBoxPython3_8
-VBoxPython3_8_EXTENDS    = VBoxPythonBase
-VBoxPython3_8_EXTENDS_BY = appending
-VBoxPython3_8_INCS       = $(VBOX_PYTHON38_INC)
-VBoxPython3_8_LIBS       = $(VBOX_PYTHON38_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON38_LIB_X86
-DLLS += VBoxPython3_8_x86
-VBoxPython3_8_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_8_x86_EXTENDS_BY = appending
-VBoxPython3_8_x86_INCS       = $(VBOX_PYTHON38_INC)
-VBoxPython3_8_x86_LIBS       = $(VBOX_PYTHON38_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON38M_INC
-#
-# Python 3.8 version with pymalloc
-#
-DLLS += VBoxPython3_8m
-VBoxPython3_8m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_8m_EXTENDS_BY = appending
-VBoxPython3_8m_INCS       = $(VBOX_PYTHON38M_INC)
-VBoxPython3_8m_LIBS       = $(VBOX_PYTHON38M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON38M_LIB_X86
-DLLS += VBoxPython3_8m_x86
-VBoxPython3_8m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_8m_x86_EXTENDS_BY = appending
-VBoxPython3_8m_x86_INCS       = $(VBOX_PYTHON38M_INC)
-VBoxPython3_8m_x86_LIBS       = $(VBOX_PYTHON38M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON39_INC
-#
-# Python 3.9 version
-#
-DLLS += VBoxPython3_9
-VBoxPython3_9_EXTENDS    = VBoxPythonBase
-VBoxPython3_9_EXTENDS_BY = appending
-VBoxPython3_9_INCS       = $(VBOX_PYTHON39_INC)
-VBoxPython3_9_LIBS       = $(VBOX_PYTHON39_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON39_LIB_X86
-DLLS += VBoxPython3_9_x86
-VBoxPython3_9_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_9_x86_EXTENDS_BY = appending
-VBoxPython3_9_x86_INCS       = $(VBOX_PYTHON39_INC)
-VBoxPython3_9_x86_LIBS       = $(VBOX_PYTHON39_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON39M_INC
-#
-# Python 3.9 version with pymalloc
-#
-DLLS += VBoxPython3_9m
-VBoxPython3_9m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_9m_EXTENDS_BY = appending
-VBoxPython3_9m_INCS       = $(VBOX_PYTHON39M_INC)
-VBoxPython3_9m_LIBS       = $(VBOX_PYTHON39M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON39M_LIB_X86
-DLLS += VBoxPython3_9m_x86
-VBoxPython3_9m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_9m_x86_EXTENDS_BY = appending
-VBoxPython3_9m_x86_INCS       = $(VBOX_PYTHON39M_INC)
-VBoxPython3_9m_x86_LIBS       = $(VBOX_PYTHON39M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON310_INC
-#
-# Python 3.10 version
-#
-DLLS += VBoxPython3_10
-VBoxPython3_10_EXTENDS    = VBoxPythonBase
-VBoxPython3_10_EXTENDS_BY = appending
-VBoxPython3_10_INCS       = $(VBOX_PYTHON310_INC)
-VBoxPython3_10_LIBS       = $(VBOX_PYTHON310_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON310_LIB_X86
-DLLS += VBoxPython3_10_x86
-VBoxPython3_10_x86_EXTENDS    = VBoxPythonBase_x86
-VBoxPython3_10_x86_EXTENDS_BY = appending
-VBoxPython3_10_x86_INCS       = $(VBOX_PYTHON310_INC)
-VBoxPython3_10_x86_LIBS       = $(VBOX_PYTHON310_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHON310M_INC
-#
-# Python 3.10 version with pymalloc
-#
-DLLS += VBoxPython3_10m
-VBoxPython3_10m_EXTENDS    = VBoxPythonBase_m
-VBoxPython3_10m_EXTENDS_BY = appending
-VBoxPython3_10m_INCS       = $(VBOX_PYTHON310M_INC)
-VBoxPython3_10m_LIBS       = $(VBOX_PYTHON310M_LIB)
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHON310M_LIB_X86
-DLLS += VBoxPython3_10m_x86
-VBoxPython3_10m_x86_EXTENDS    = VBoxPythonBase_x86_m
-VBoxPython3_10m_x86_EXTENDS_BY = appending
-VBoxPython3_10m_x86_INCS       = $(VBOX_PYTHON310M_INC)
-VBoxPython3_10m_x86_LIBS       = $(VBOX_PYTHON310M_LIB_X86)
-  endif
- endif
-endif
-
-ifdef VBOX_PYTHONDEF_INC
-#
-# Python without versioning
-#
-DLLS += VBoxPython
-VBoxPython_EXTENDS      = VBoxPythonBase
-VBoxPython_DEFS         = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS))
-VBoxPython_INCS         = $(VBoxPythonBase_INCS) $(VBOX_PYTHONDEF_INC)
-if "$(KBUILD_TARGET)" == "linux"
- VBoxPython_LIBS        = $(VBoxPythonBase_LIBS)
-else
- VBoxPython_LIBS        = $(VBoxPythonBase_LIBS) $(VBOX_PYTHONDEF_LIB)
-endif
-
- ifdef VBOX_WITH_32_ON_64_MAIN_API
-  ifdef VBOX_PYTHONDEF_LIB_X86
-VBoxPython_x86_EXTENDS      = VBoxPythonBase_x86
-VBoxPython_x86_DEFS         = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_x86_DEFS))
-VBoxPython_x86_INCS         = $(VBoxPythonBase_x86_INCS) $(VBOX_PYTHONDEF_INC)
-if "$(KBUILD_TARGET)" == "linux"
- VBoxPython_x86_LIBS        = $(VBoxPythonBase_x86_LIBS)
-else
- VBoxPython_x86_LIBS        = $(VBoxPythonBase_x86_LIBS) $(VBOX_PYTHONDEF_LIB_X86)
-endif
-  endif
- endif
-endif
+    VBoxPython_LIBS     = $(VBoxPythonBase_LIBS) $(VBOX_PYTHONDEF_LIB)
+   endif
+
+   ifdef VBOX_WITH_32_ON_64_MAIN_API
+    ifdef VBOX_PYTHONDEF_LIB_X86
+     VBoxPython_x86_EXTENDS = VBoxPythonBase_x86
+     VBoxPython_x86_DEFS    = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_x86_DEFS))
+     VBoxPython_x86_INCS    = $(VBoxPythonBase_x86_INCS) $(VBOX_PYTHONDEF_INC)
+     if "$(KBUILD_TARGET)" == "linux"
+      VBoxPython_x86_LIBS   = $(VBoxPythonBase_x86_LIBS)
+     else
+      VBoxPython_x86_LIBS   = $(VBoxPythonBase_x86_LIBS) $(VBOX_PYTHONDEF_LIB_X86)
+     endif
+    endif
+   endif
+  endif
 
  endif # !VBOX_WITH_ONLY_PYTHON_LIMITED_API
 
  ifndef VBOX_WITHOUT_PYTHON_LIMITED_API
-#
-# If there is python 3.3 or later present, we can build a generic
-# 3.x extension.  Since 3.3 and 3.4 are rather old, we will pick
-# those headers last.
-#
-# Note! No library dependencies are needed here (at least that's
-#       how the xxlimited.so demo extension is done on linux and darwin).
-# Note! The 'm' ABI suffix was discontinued in 3.8.
-# TODO: ASSUMING that we don't need a different headers for pymalloc
-#       ('m' builds < 3.8) and CRT malloc.
-#
-VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310   34 33 \
-,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
+  #
+  # If there is python 3.3 or later present, we can build a generic
+  # 3.x extension.  Since 3.3 and 3.4 are rather old, we will pick
+  # those headers last.
+  #
+  # Note! No library dependencies are needed here (at least that's
+  #       how the xxlimited.so demo extension is done on linux and darwin).
+  # Note! The 'm' ABI suffix was discontinued in 3.8.
+  # TODO: ASSUMING that we don't need a different headers for pymalloc
+  #       ('m' builds < 3.8) and CRT malloc.
+  #
+  VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310   34 33 \
+  	,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
   ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)
-DLLS += VBoxPython3
-VBoxPython3_EXTENDS      = VBoxPythonBase
-VBoxPython3_DEFS         = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000
-VBoxPython3_INCS         = $(VBoxPythonBase_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
-
-DLLS += VBoxPython3m
-VBoxPython3m_EXTENDS     = VBoxPythonBase_m
-VBoxPython3m_DEFS        = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000
-VBoxPython3m_INCS        = $(VBoxPythonBase_m_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
+   DLLS += VBoxPython3
+   VBoxPython3_EXTENDS   = VBoxPythonBase
+   VBoxPython3_DEFS      = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000
+   VBoxPython3_INCS      = $(VBoxPythonBase_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
+
+   DLLS += VBoxPython3m
+   VBoxPython3m_EXTENDS  = VBoxPythonBase_m
+   VBoxPython3m_DEFS     = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000
+   VBoxPython3m_INCS     = $(VBoxPythonBase_m_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC)
   endif
  endif # VBOX_WITH_PYTHON_LIMITED_API
