summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libs/xpcom18a4/Config.kmk60
-rw-r--r--src/libs/xpcom18a4/Makefile.kmk70
2 files changed, 65 insertions, 65 deletions
diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk
index 21a35cdad56..990b29febbb 100644
--- a/src/libs/xpcom18a4/Config.kmk
+++ b/src/libs/xpcom18a4/Config.kmk
@@ -217,42 +217,42 @@ TEMPLATE_XPCOMYASM_ASDEFS = $(TEMPLATE_VBoxR3DllNonPedantic_DEFS)
#
# Template for building the XPCOM executables.
-# Used as a base template by XPCOMTSTEXE and XPCOMIPCEXE.
+# Used as a base template by XPComTstExe and XPCOMIPCEXE.
#
-TEMPLATE_XPCOMEXE = XPCOM executable files
-TEMPLATE_XPCOMEXE_EXTENDS = XPCOM
+TEMPLATE_XPComExe = XPCOM executable files
+TEMPLATE_XPComExe_EXTENDS = XPCOM
## @todo undo -fPIC.
-TEMPLATE_XPCOMEXE_INCS = ipc/ipcd/shared/src \
+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 \
.
-TEMPLATE_XPCOMEXE_LIBS = \
+TEMPLATE_XPComExe_LIBS = \
$(VBox-xpcom-ipcshared_1_TARGET) \
$(VBoxXPCOM_1_TARGET) \
$(TEMPLATE_XPCOM_LIBS)
-TEMPLATE_XPCOMEXE_LIBS.freebsd = $(LIB_PTHREAD)
-TEMPLATE_XPCOMEXE_LIBS.linux = dl $(LIB_PTHREAD)
-TEMPLATE_XPCOMEXE_LDFLAGS.darwin = -bind_at_load $(filter-out -current_version -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPCOM_LDFLAGS.darwin))
+TEMPLATE_XPComExe_LIBS.freebsd = $(LIB_PTHREAD)
+TEMPLATE_XPComExe_LIBS.linux = dl $(LIB_PTHREAD)
+TEMPLATE_XPComExe_LDFLAGS.darwin = -bind_at_load $(filter-out -current_version -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD),$(TEMPLATE_XPCOM_LDFLAGS.darwin))
#
# Template for building the XPCOM testcase executables
#
-TEMPLATE_XPCOMTSTEXE = XPCOM executable files (testcases)
-TEMPLATE_XPCOMTSTEXE_EXTENDS = XPCOMEXE
-TEMPLATE_XPCOMTSTEXE_CXXFLAGS = $(TEMPLATE_XPCOMEXE_CXXFLAGS) -Wno-format
-TEMPLATE_XPCOMTSTEXE_CFLAGS = $(TEMPLATE_XPCOMEXE_CFLAGS) -Wno-format
-TEMPLATE_XPCOMTSTEXE_INST = $(INST_TESTCASE)
+TEMPLATE_XPComTstExe = XPCOM executable files (testcases)
+TEMPLATE_XPComTstExe_EXTENDS = XPComExe
+TEMPLATE_XPComTstExe_CXXFLAGS = $(TEMPLATE_XPComExe_CXXFLAGS) -Wno-format
+TEMPLATE_XPComTstExe_CFLAGS = $(TEMPLATE_XPComExe_CFLAGS) -Wno-format
+TEMPLATE_XPComTstExe_INST = $(INST_TESTCASE)
ifdef VBOX_WITH_RUNPATH
- TEMPLATE_XPCOMTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_XPCOMEXE_LDFLAGS)
+ TEMPLATE_XPComTstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_XPComExe_LDFLAGS)
else ifdef VBOX_WITH_RELATIVE_RUNPATH
- TEMPLATE_XPCOMTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_XPCOMEXE_LDFLAGS)
+ TEMPLATE_XPComTstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_XPComExe_LDFLAGS)
endif
if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE)
- TEMPLATE_XPCOMTSTEXE_POST_CMDS =
+ TEMPLATE_XPComTstExe_POST_CMDS =
endif
@@ -262,26 +262,26 @@ endif
# It extends the BLDPROG template in config.kmk but overrides CFLAGS
# and CXXFLAGS completely at the moment.
#
-TEMPLATE_XPCOMBLDPROG = XPCOM Build programs executables
-TEMPLATE_XPCOMBLDPROG_EXTENDS = VBoxBldProg
-## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPCOMEXE is expanded when this is being used.)
-TEMPLATE_XPCOMBLDPROG_DEFS = \
+TEMPLATE_XPComBldProg = XPCOM Build programs executables
+TEMPLATE_XPComBldProg_EXTENDS = VBoxBldProg
+## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPComExe is expanded when this is being used.)
+TEMPLATE_XPComBldProg_DEFS = \
$(TEMPLATE_VBoxBldProg_DEFS) \
- $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPCOMEXE_DEFS))
-TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST))
-TEMPLATE_XPCOMBLDPROG_DEFS.x86 = $(TEMPLATE_VBoxBldProg_DEFS.x86) $(TEMPLATE_XPCOMEXE_DEFS.x86)
-TEMPLATE_XPCOMBLDPROG_DEFS.amd64 = $(TEMPLATE_VBoxBldProg_DEFS.amd64) $(TEMPLATE_XPCOMEXE_DEFS.amd64)
-TEMPLATE_XPCOMBLDPROG_INCS = \
+ $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPComExe_DEFS))
+TEMPLATE_XPComBldProg_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPComExe_DEFS.$(KBUILD_HOST))
+TEMPLATE_XPComBldProg_DEFS.x86 = $(TEMPLATE_VBoxBldProg_DEFS.x86) $(TEMPLATE_XPComExe_DEFS.x86)
+TEMPLATE_XPComBldProg_DEFS.amd64 = $(TEMPLATE_VBoxBldProg_DEFS.amd64) $(TEMPLATE_XPComExe_DEFS.amd64)
+TEMPLATE_XPComBldProg_INCS = \
$(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_XPCOMBLDPROG_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti
-TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway.
-TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
-TEMPLATE_XPCOMBLDPROG_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
+TEMPLATE_XPComBldProg_CFLAGS = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format
+TEMPLATE_XPComBldProg_CXXFLAGS.darwin = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-common -fno-rtti
+TEMPLATE_XPComBldProg_CXXFLAGS.solaris = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris) -fno-omit-frame-pointer # for now anyway.
+TEMPLATE_XPComBldProg_LDFLAGS.darwin = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin) -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
+TEMPLATE_XPComBldProg_ORDERDEPS = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
ifeq ($(VBOX_DEF_MACOSX_VERSION_MIN),10.4)
diff --git a/src/libs/xpcom18a4/Makefile.kmk b/src/libs/xpcom18a4/Makefile.kmk
index 7402d34696d..246479cb8e8 100644
--- a/src/libs/xpcom18a4/Makefile.kmk
+++ b/src/libs/xpcom18a4/Makefile.kmk
@@ -427,7 +427,7 @@ IPCD-HEADERS_SOURCES = \
# We build it statically because we cannot rely on additional .a files
# like in the original build
#
-xpidl_TEMPLATE = XPCOMBLDPROG
+xpidl_TEMPLATE = XPComBldProg
xpidl_DEFS = EXPORT_XPT_API
## @todo This assumes HOST == TARGET.
xpidl_INST = $(INST_BIN)
@@ -435,10 +435,10 @@ xpidl_INST = $(INST_BIN)
#if "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "darwin.amd64" && defined(VBOX_MACOS_10_5_WORKAROUND)
# xpidl_BLD_TRG_ARCH = x86
# ## @todo kBuild ticket 84 workarounds:
-# xpidl_DEFS.x86 = $(TEMPLATE_XPCOMBLDPROG_DEFS.x86)
-# xpidl_CFLAGS.x86 = $(TEMPLATE_XPCOMBLDPROG_CFLAGS.x86)
-# xpidl_CXXFLAGS.x86 = $(TEMPLATE_XPCOMBLDPROG_CXXFLAGS.x86)
-# xpidl_LDFLAGS.x86 = $(TEMPLATE_XPCOMBLDPROG_LDFLAGS.x86)
+# xpidl_DEFS.x86 = $(TEMPLATE_XPComBldProg_DEFS.x86)
+# xpidl_CFLAGS.x86 = $(TEMPLATE_XPComBldProg_CFLAGS.x86)
+# xpidl_CXXFLAGS.x86 = $(TEMPLATE_XPComBldProg_CXXFLAGS.x86)
+# xpidl_LDFLAGS.x86 = $(TEMPLATE_XPComBldProg_LDFLAGS.x86)
#endif
ifdef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
xpidl_DEFS += VBOX_XPIDL_EMULATE_GENJIFACES VBOX_XPIDL_EMULATE_GENJIFACES_DIFF
@@ -503,7 +503,7 @@ endif
#
# The XPT linker.
#
-xpt_link_TEMPLATE = XPCOMBLDPROG
+xpt_link_TEMPLATE = XPComBldProg
xpt_link_SOURCES = \
xpcom/typelib/xpt/tools/xpt_link.c \
xpcom/typelib/xpt/src/xpt_arena.c \
@@ -1145,8 +1145,8 @@ TEMPLATE_XPCOMIPC-x86_BLD_TRG_ARCH = x86
TEMPLATE_XPCOMIPC-x86_LIBS = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPCOM-x86_LIBS)
TEMPLATE_XPCOMIPCEXE = XPCOM IPC executables
-TEMPLATE_XPCOMIPCEXE_EXTENDS = XPCOMEXE
-TEMPLATE_XPCOMIPCEXE_DEFS = $(TEMPLATE_XPCOMEXE_DEFS) BUILD_DCONNECT=1
+TEMPLATE_XPCOMIPCEXE_EXTENDS = XPComExe
+TEMPLATE_XPCOMIPCEXE_DEFS = $(TEMPLATE_XPComExe_DEFS) BUILD_DCONNECT=1
ifdef IPC_LOGGING
TEMPLATE_XPCOMIPCEXE_DEFS += IPC_LOGGING
endif
@@ -1244,60 +1244,60 @@ endif # !VBOX_ONLY_EXTPACKS
#
# testcases
#
-tstnsIFileEnumerator_TEMPLATE = XPCOMTSTEXE
+tstnsIFileEnumerator_TEMPLATE = XPComTstExe
tstnsIFileEnumerator_SOURCES = xpcom/tests/nsIFileEnumerator.cpp
-tstnsIFileTest_TEMPLATE = XPCOMTSTEXE
+tstnsIFileTest_TEMPLATE = XPComTstExe
tstnsIFileTest_SOURCES = xpcom/tests/nsIFileTest.cpp
-tstTestArray_TEMPLATE = XPCOMTSTEXE
+tstTestArray_TEMPLATE = XPComTstExe
tstTestArray_SOURCES = xpcom/tests/TestArray.cpp
-tstTestAtoms_TEMPLATE = XPCOMTSTEXE
+tstTestAtoms_TEMPLATE = XPComTstExe
tstTestAtoms_SOURCES = xpcom/tests/TestAtoms.cpp
-tstTestAutoLock_TEMPLATE = XPCOMTSTEXE
+tstTestAutoLock_TEMPLATE = XPComTstExe
tstTestAutoLock_SOURCES = xpcom/tests/TestAutoLock.cpp
-tstTestCallTemplates_TEMPLATE = XPCOMTSTEXE
+tstTestCallTemplates_TEMPLATE = XPComTstExe
tstTestCallTemplates_SOURCES = xpcom/tests/TestCallTemplates.cpp
-tstTestCOMPtr_TEMPLATE = XPCOMTSTEXE
+tstTestCOMPtr_TEMPLATE = XPComTstExe
tstTestCOMPtr_SOURCES = xpcom/tests/TestCOMPtr.cpp
-tstTestCOMPtrEq_TEMPLATE = XPCOMTSTEXE
+tstTestCOMPtrEq_TEMPLATE = XPComTstExe
tstTestCOMPtrEq_SOURCES = xpcom/tests/TestCOMPtrEq.cpp
-tstTestCRT_TEMPLATE = XPCOMTSTEXE
+tstTestCRT_TEMPLATE = XPComTstExe
tstTestCRT_SOURCES = xpcom/tests/TestCRT.cpp
-tstTestFactory_TEMPLATE = XPCOMTSTEXE
+tstTestFactory_TEMPLATE = XPComTstExe
tstTestFactory_SOURCES = xpcom/tests/TestFactory.cpp
-tstTestHashtables_TEMPLATE = XPCOMTSTEXE
+tstTestHashtables_TEMPLATE = XPComTstExe
tstTestHashtables_SOURCES = xpcom/tests/TestHashtables.cpp
-tstTestID_TEMPLATE = XPCOMTSTEXE
+tstTestID_TEMPLATE = XPComTstExe
tstTestID_SOURCES = xpcom/tests/TestID.cpp
-tstTestObserverService_TEMPLATE= XPCOMTSTEXE
+tstTestObserverService_TEMPLATE= XPComTstExe
tstTestObserverService_SOURCES = xpcom/tests/TestObserverService.cpp
-tstTestPermanentAtoms_TEMPLATE = XPCOMTSTEXE
+tstTestPermanentAtoms_TEMPLATE = XPComTstExe
tstTestPermanentAtoms_SOURCES = xpcom/tests/TestPermanentAtoms.cpp
-tstTestPipes_TEMPLATE = XPCOMTSTEXE
+tstTestPipes_TEMPLATE = XPComTstExe
tstTestPipes_SOURCES = xpcom/tests/TestPipes.cpp
-tstTestServMgr_TEMPLATE = XPCOMTSTEXE
+tstTestServMgr_TEMPLATE = XPComTstExe
tstTestServMgr_SOURCES = xpcom/tests/TestServMgr.cpp
tstTestServMgr_INCS = xpcom/tests/services
-tstTestThreads_TEMPLATE = XPCOMTSTEXE
+tstTestThreads_TEMPLATE = XPComTstExe
tstTestThreads_SOURCES = xpcom/tests/TestThreads.cpp
-tstTestXPIDLString_TEMPLATE = XPCOMTSTEXE
+tstTestXPIDLString_TEMPLATE = XPComTstExe
tstTestXPIDLString_SOURCES = xpcom/tests/TestXPIDLString.cpp
-tstTestXPTCInvoke_TEMPLATE = XPCOMTSTEXE
+tstTestXPTCInvoke_TEMPLATE = XPComTstExe
tstTestXPTCInvoke_SOURCES = xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp
-tstTestDeque_TEMPLATE = XPCOMTSTEXE
+tstTestDeque_TEMPLATE = XPComTstExe
tstTestDeque_SOURCES = xpcom/tests/TestDeque.cpp
-tstTestAutoPtr_TEMPLATE = XPCOMTSTEXE
+tstTestAutoPtr_TEMPLATE = XPComTstExe
tstTestAutoPtr_SOURCES = xpcom/tests/TestAutoPtr.cpp
-tstTestMinStringAPI_TEMPLATE = XPCOMTSTEXE
+tstTestMinStringAPI_TEMPLATE = XPComTstExe
tstTestMinStringAPI_SOURCES = xpcom/tests/TestMinStringAPI.cpp
-tstTestStrings_TEMPLATE = XPCOMTSTEXE
+tstTestStrings_TEMPLATE = XPComTstExe
tstTestStrings_SOURCES = xpcom/tests/TestStrings.cpp
-tstPrimitiveTest_TEMPLATE = XPCOMTSTEXE
+tstPrimitiveTest_TEMPLATE = XPComTstExe
tstPrimitiveTest_SOURCES = xpcom/typelib/xpt/tests/PrimitiveTest.c
-tstSimpleTypeLib_TEMPLATE = XPCOMTSTEXE
+tstSimpleTypeLib_TEMPLATE = XPComTstExe
tstSimpleTypeLib_SOURCES = xpcom/typelib/xpt/tests/SimpleTypeLib.c
-tstXptDump_TEMPLATE = XPCOMTSTEXE
+tstXptDump_TEMPLATE = XPComTstExe
tstXptDump_SOURCES = xpcom/typelib/xpt/tools/xpt_dump.c
-tstXptLink_TEMPLATE = XPCOMTSTEXE
+tstXptLink_TEMPLATE = XPComTstExe
tstXptLink_SOURCES = xpcom/typelib/xpt/tools/xpt_link.c
View Lorry Controller Status