Changeset 98251 in vbox

Timestamp:

Jan 23, 2023 5:31:05 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155450

Message:

*.kmk: s/VBOX_TPMS/VBoxLibTpms (sdk) bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• configure (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -5028 +5028 @@
 
 ifdef VBOX_WITH_LIBTPMS
- SDK_VBOX_TPMS                 := libtpms for dll linking.
- SDK_VBOX_TPMS_DEFAULT_INCS    := $(PATH_ROOT)/src/libs/libtpms-0.9.0/include
- SDK_VBOX_TPMS_INCS            ?= $(SDK_VBOX_TPMS_DEFAULT_INCS)
- SDK_VBOX_TPMS_LIBS            ?= $(PATH_STAGE_LIB)/VBox-libtpms$(VBOX_SUFF_LIB)
+ SDK_VBoxLibTpms                 := libtpms for dll linking.
+ SDK_VBoxLibTpms_DEFAULT_INCS    := $(PATH_ROOT)/src/libs/libtpms-0.9.0/include
+ SDK_VBoxLibTpms_INCS            ?= $(SDK_VBoxLibTpms_DEFAULT_INCS)
+ SDK_VBoxLibTpms_LIBS            ?= $(PATH_STAGE_LIB)/VBox-libtpms$(VBOX_SUFF_LIB)
 endif
 

trunk/configure

@@ -1801 +1801 @@
       if test_compile "$LIBTPMS $I_INCTPMS" libtpms libtpms nofatal; then
         if test_execute; then
-          cnf_append "SDK_VBOX_TPMS_INCS" "$INCTPMS"
-          cnf_append "SDK_VBOX_TPMS_LIBS" "`strip_l "$LIBTPMS"`"
+          cnf_append "SDK_VBoxLibTpms_INCS" "$INCTPMS"
+          cnf_append "SDK_VBoxLibTpms_LIBS" "`strip_l "$LIBTPMS"`"
         fi
       else

trunk/src/VBox/Devices/Makefile.kmk

@@ -636 +636 @@
 
   if defined(VBOX_WITH_LIBTPMS)
-   VBoxDD_SDKS          += VBOX_TPMS
+   VBoxDD_SDKS          += VBoxLibTpms
    VBoxDD_DEFS          += VBOX_WITH_LIBTPMS
    VBoxDD_SOURCES += \

trunk/src/libs/Makefile.kmk

@@ -81 +81 @@
 if defined(VBOX_WITH_LIBTPMS) \
  && !defined(VBOX_ONLY_BUILD) \
- && ("$(SDK_VBOX_TPMS_INCS)" == "$(SDK_VBOX_TPMS_DEFAULT_INCS)")
+ && ("$(SDK_VBoxLibTpms_INCS)" == "$(SDK_VBoxLibTpms_DEFAULT_INCS)")
   include $(PATH_SUB_CURRENT)/libtpms-0.9.0/Makefile.kmk
 endif