libs/xpcom18a4: s/XPCOMEXE/XPComExe/ s/XPCOMTSTEXE/XPComTstExe/ s/XPCOMBLDPROG/XPComBldProg/ bugref:10348

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@98220 cfe28804-0f27-0410-a406-dd0f0b0b656f

1 files changed, 30 insertions, 30 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)