Changeset 106873 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 7, 2024 4:03:07 PM (3 months ago)

Author:

vboxsync

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

165793

Message:

Add/VBoxGuest/Makefile.kmk: Fixed regression from r165131 where VBoxGuest.sys wouldn't be installed when signing is disabled (win32-dep* builds). VBoxGuest.inf (esp. not unedited) doesn't belong in the SOURCES list AFAIK. We don't use += for the first assignment of a target property, that's confusing. bugref:10762

File:

• trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -53 +53 @@
  VBoxGuest_NAME.solaris  = vboxguest
  VBoxGuest_INST.darwin   = $(INST_ADDITIONS)VBoxGuest.kext/Contents/MacOS/
- #if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) # See Additions/WINNT/Makefile.kmk?
- VBoxGuest_INSTTYPE.win  = none
- VBoxGuest_DEBUG_INSTTYPE.win  = both
- #endif
+ if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) # See Additions/WINNT/Makefile.kmk?
+  VBoxGuest_INSTTYPE.win  = none
+  VBoxGuest_DEBUG_INSTTYPE.win  = both
+ endif
  VBoxGuest_DEFS.haiku    = VBOX_SVN_REV=$(VBOX_SVN_REV) _KERNEL_MODE=1
  VBoxGuest_DEFS.solaris  = VBOX_SVN_REV=$(VBOX_SVN_REV)
@@ -117 +117 @@
   endif # win
   ifn1of ($(KBUILD_TARGET), linux freebsd netbsd solaris haiku)
-   VBoxGuest_SOURCES   += VBoxGuest-$(KBUILD_TARGET).cpp
+   VBoxGuest_SOURCES    = VBoxGuest-$(KBUILD_TARGET).cpp
   else
-   VBoxGuest_SOURCES   += VBoxGuest-$(KBUILD_TARGET).c
+   VBoxGuest_SOURCES    = VBoxGuest-$(KBUILD_TARGET).c
    VBoxGuest_$(KBUILD_TARGET).c_DEPS = $(VBOX_SVN_REV_HEADER)
    ifeq ($(KBUILD_TARGET),freebsd)
@@ -128 +128 @@
         VBoxGuest.cpp
   VBoxGuest_SOURCES.win += \
-        win/VBoxGuest.inf \
         win/VBoxGuest.rc
   VBoxGuest_SOURCES.win.x86 += \