Changeset 98185 in vbox

Timestamp:

Jan 21, 2023 10:42:40 PM (2 years ago)

Author:

vboxsync

Message:

*.kmk: s/VBOXMAINCOMP/VBoxMainComp/ bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -7312 +7312 @@
 # (No difference when building against COM on Windows.)
 #
-TEMPLATE_VBOXMAINCOMP            = VBox Main COM/XPCOM Component (shared library)
-TEMPLATE_VBOXMAINCOMP_EXTENDS    = VBoxMainExe
+TEMPLATE_VBoxMainComp            = VBox Main COM/XPCOM Component (shared library)
+TEMPLATE_VBoxMainComp_EXTENDS    = VBoxMainExe
 ifn1of ($(KBUILD_TARGET), win)
- TEMPLATE_VBOXMAINCOMP_INST      = $(INST_BIN)components/
+ TEMPLATE_VBoxMainComp_INST      = $(INST_BIN)components/
 endif
 ifneq ($(KBUILD_TARGET),win)
  ifeq ($(filter-out solaris.x86 %.amd64 %.sparc32 %.sparc64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) ## TODO: cleanup!
-  TEMPLATE_VBOXMAINCOMP_DEFS     = PIC $(TEMPLATE_VBoxMainExe_DEFS)
-  TEMPLATE_VBOXMAINCOMP_CFLAGS   = -fPIC $(TEMPLATE_VBoxMainExe_CFLAGS)
-  TEMPLATE_VBOXMAINCOMP_CXXFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_CXXFLAGS)
-  TEMPLATE_VBOXMAINCOMP_PCHFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_PCHFLAGS)
+  TEMPLATE_VBoxMainComp_DEFS     = PIC $(TEMPLATE_VBoxMainExe_DEFS)
+  TEMPLATE_VBoxMainComp_CFLAGS   = -fPIC $(TEMPLATE_VBoxMainExe_CFLAGS)
+  TEMPLATE_VBoxMainComp_CXXFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_CXXFLAGS)
+  TEMPLATE_VBoxMainComp_PCHFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_PCHFLAGS)
   if defined(VBOX_WITH_RELATIVE_RUNPATH) && !defined(VBOX_WITH_HARDENING)
-   TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBoxMainExe_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
+   TEMPLATE_VBoxMainComp_LDFLAGS = -fPIC $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBoxMainExe_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
   else
-   TEMPLATE_VBOXMAINCOMP_LDFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_LDFLAGS)
+   TEMPLATE_VBoxMainComp_LDFLAGS = -fPIC $(TEMPLATE_VBoxMainExe_LDFLAGS)
   endif
  else ifndef VBOX_WITH_HARDENING
   ifdef VBOX_WITH_RELATIVE_RUNPATH
-   TEMPLATE_VBOXMAINCOMP_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBoxMainExe_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
-  endif
- endif
-endif
-TEMPLATE_VBOXMAINCOMP_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBoxMainExe_LDFLAGS.darwin)) \
+   TEMPLATE_VBoxMainComp_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%',$(TEMPLATE_VBoxMainExe_LDFLAGS)) '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..'
+  endif
+ endif
+endif
+TEMPLATE_VBoxMainComp_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBoxMainExe_LDFLAGS.darwin)) \
         -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
         -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
 
 TEMPLATE_VBoxMainComp-x86  = 32-bit VBox Main Component (shared library)
-TEMPLATE_VBoxMainComp-x86_EXTENDS = VBOXMAINCOMP
+TEMPLATE_VBoxMainComp-x86_EXTENDS = VBoxMainComp
 TEMPLATE_VBoxMainComp-x86_BLD_TRG_ARCH = x86
 TEMPLATE_VBoxMainComp-x86_INST.win = $(INST_DLL)x86/
-TEMPLATE_VBoxMainComp-x86_DEFS = $(filter-out HC_ARCH_BITS%,$(TEMPLATE_VBOXMAINCOMP_DEFS)) HC_ARCH_BIT=32 ARCH_BITS=32 \
+TEMPLATE_VBoxMainComp-x86_DEFS = $(filter-out HC_ARCH_BITS%,$(TEMPLATE_VBoxMainComp_DEFS)) HC_ARCH_BIT=32 ARCH_BITS=32 \
         VBOX_IN_32_ON_64_MAIN_API
 TEMPLATE_VBoxMainComp-x86_LIBS = \
@@ -7348 +7348 @@
         $(subst $(LIB_RUNTIME),$(VBOX_LIB_RUNTIME_X86),\
         $(subst $(LIB_XPCOM),$(VBOX_LIB_XPCOM_X86),\
-        $(TEMPLATE_VBOXMAINCOMP_LIBS))))
+        $(TEMPLATE_VBoxMainComp_LIBS))))
 
 

trunk/src/VBox/Main/Makefile.kmk

@@ -939 +939 @@
 #
 DLLS += VBoxSVCM
-VBoxSVCM_TEMPLATE       = VBOXMAINCOMP
+VBoxSVCM_TEMPLATE       = VBoxMainComp
 VBoxSVCM_DEFS           = IN_RING3 $(VBOX_MAIN_DEFS)
  ifdef VBOX_WITH_HARDENING
@@ -977 +977 @@
 #
 DLLS += VBoxC
-VBoxC_TEMPLATE  = VBOXMAINCOMP
+VBoxC_TEMPLATE  = VBoxMainComp
 if defined(VBOX_WITH_PRECOMPILED_HEADERS) && "$(KBUILD_TARGET)" == "win"
  VBoxC_USES     = vccprecomp
@@ -1489 +1489 @@
  #
  DLLS += VBoxProxyStub
- VBoxProxyStub_TEMPLATE = VBOXMAINCOMP
+ VBoxProxyStub_TEMPLATE = VBoxMainComp
  ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
   VBoxProxyStub_DEFS   := REGISTER_PROXY_DLL PROXY_CLSID_IS=$(quote $(VBOX_MIDL_PROXY_CLSID_IS))
@@ -1515 +1515 @@
 
  DLLS += VBoxProxyStubLegacy
- VBoxProxyStubLegacy_TEMPLATE = VBOXMAINCOMP
+ VBoxProxyStubLegacy_TEMPLATE = VBoxMainComp
  VBoxProxyStubLegacy_EXTENDS  = VBoxProxyStub
  VBoxProxyStubLegacy_DEFS     = $(VBoxProxyStub_DEFS) VBOX_IN_PROXY_STUB_LEGACY