Changeset 98223 in vbox for trunk/src

Timestamp:

Jan 23, 2023 1:18:51 AM (2 years ago)

Author:

vboxsync

Message:

libs/xpcom18a4: s/XPCOM/XPComDll/ ++ [fixes] bugref:10348

File:

• trunk/src/libs/xpcom18a4/Makefile.kmk (modified) (8 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -50 +50 @@
 endif
 
-# @todo check whether VBoxXPComIPCC.so or VBoxXPCOMIPCD contain undefined
+# @todo check whether VBoxXPCOMIPCC.so or VBoxXPCOMIPCD contain undefined
 # symbols starting with NS_, PL_, PR_ or XPT. Would move the test time failure
 # when missing a symbol renaming to a build time failure. Likewise, there
@@ -108 +108 @@
 VBOX_XPCOM_DLLS := \
         VBoxXPCOM \
-        VBoxXPComIPCC
+        VBoxXPCOMIPCC
 DLLS += $(VBOX_XPCOM_DLLS)
 
@@ -1047 +1047 @@
 # The 32-bit VBoxXPCOM Shared Object, assembling all lib files.
 #
-VBoxXPComDll-x86_TEMPLATE = XPComDll-x86
-VBoxXPComDll-x86_EXTENDS = VBoxXPCOM
-VBoxXPComDll-x86_NAME = VBoxXPComDll-x86
-VBoxXPComDll-x86_LIBS = \
+VBoxXPCOM-x86_TEMPLATE = XPComDll-x86
+VBoxXPCOM-x86_EXTENDS = VBoxXPCOM
+VBoxXPCOM-x86_NAME = VBoxXPCOM-x86
+VBoxXPCOM-x86_LIBS = \
         $(VBox-xpcom-typelib-x86_1_TARGET) \
         $(VBox-xpcom-string-x86_1_TARGET) \
@@ -1065 +1065 @@
 
 ifeq ($(filter-out freebsd linux netbsd openbsd,$(KBUILD_TARGET)),) # gnu ld.
-VBoxXPComDll-x86_LDFLAGS = -Wl,--whole-archive \
+VBoxXPCOM-x86_LDFLAGS = -Wl,--whole-archive \
         $(VBox-xpcom-typelib-x86_1_TARGET) \
         $(VBox-xpcom-string-x86_1_TARGET) \
@@ -1081 +1081 @@
 endif
 
-VBoxXPComDll-x86_LDFLAGS.solaris += -Wl,-z,allextract \
+VBoxXPCOM-x86_LDFLAGS.solaris += -Wl,-z,allextract \
         $(VBox-xpcom-typelib-x86_1_TARGET) \
         $(VBox-xpcom-string-x86_1_TARGET) \
@@ -1143 +1143 @@
 TEMPLATE_XPComIpcDll-x86_EXTENDS      = XPComIpcDll
 TEMPLATE_XPComIpcDll-x86_BLD_TRG_ARCH = x86
-TEMPLATE_XPComIpcDll-x86_LIBS         = $(VBoxXPComDll-x86_1_TARGET) $(TEMPLATE_XPComDll-x86_LIBS)
+TEMPLATE_XPComIpcDll-x86_LIBS         = $(VBoxXPCOM-x86_1_TARGET) $(TEMPLATE_XPComDll-x86_LIBS)
 
 TEMPLATE_XPComIpcExe               = XPCOM IPC executables
@@ -1171 +1171 @@
 # DCONNECT client shared object
 #
-VBoxXPComIPCC_TEMPLATE = XPComIpcDll
-VBoxXPComIPCC_NAME.os2 = VBoxIPCC
-VBoxXPComIPCC_INST = $(INST_BIN)components/
-#VBoxXPComIPCC_DEFS = HAVE_DEPENDENT_LIBS - dependentLibs.h is linux specific, so this cannot be required.
-VBoxXPComIPCC_SOURCES = \
+VBoxXPCOMIPCC_TEMPLATE = XPComIpcDll
+VBoxXPCOMIPCC_NAME.os2 = VBoxIPCC
+VBoxXPCOMIPCC_INST = $(INST_BIN)components/
+#VBoxXPCOMIPCC_DEFS = HAVE_DEPENDENT_LIBS - dependentLibs.h is linux specific, so this cannot be required.
+VBoxXPCOMIPCC_SOURCES = \
         ipc/ipcd/client/src/ipcdclient.cpp \
         ipc/ipcd/client/src/ipcService.cpp \
@@ -1193 +1193 @@
 
 ifeq ($(KBUILD_TARGET),win)
-VBoxXPComIPCC_SOURCES += \
+VBoxXPCOMIPCC_SOURCES += \
         ipc/ipcd/client/src/ipcConnectionWin.cpp
 else
-VBoxXPComIPCC_SOURCES += \
+VBoxXPCOMIPCC_SOURCES += \
         ipc/ipcd/client/src/ipcConnectionUnix.cpp
 endif
-VBoxXPComIPCC_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxXPComIPCC.dylib
-VBoxXPComIPCC_LIBS = \
+VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/components/VBoxXPCOMIPCC.dylib
+VBoxXPCOMIPCC_LIBS = \
         $(VBox-xpcom-ipcshared_1_TARGET)
 
 # 32-bit version of the component.
-$(evalcall VBOX_XPCOM_X86,VBoxXPComIPCC)
-VBoxXPComIPCC-x86_LIBS = \
+$(evalcall VBOX_XPCOM_X86,VBoxXPCOMIPCC)
+VBoxXPCOMIPCC-x86_LIBS = \
         $(VBox-xpcom-ipcshared-x86_1_TARGET)