Changeset 98163 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 20, 2023 3:55:53 PM (23 months ago)

Author:

vboxsync

Message:

ValKit/Audio: Don't build vkathost in an only-build unless it's the valkit one.

File:

• trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/ValidationKit/utils/audio/Makefile.kmk

@@ -60 +60 @@
  if defined(VBOX_ONLY_VALIDATIONKIT) || !defined(VBOX_ONLY_BUILD)
   PROGRAMS += vkat
-  ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
-   if !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
-    PROGRAMS += vkathost
-   endif
+  if defined(VBOX_WITH_HOST_SHIPPING_AUDIO_TEST) && !defined(VBOX_ONLY_BUILD)
+   PROGRAMS += vkathost
   endif
  endif
- ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
-  if defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_BUILD)
-   ifndef VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER
-    ifdef VBOX_WITH_ADDITIONS
-     PROGRAMS += vkatadd
-    endif
-   endif
-  endif
+ if    defined(VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST) \
+    && defined(VBOX_WITH_ADDITIONS) \
+    && defined(VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER) \
+    && (defined(VBOX_ONLY_ADDITIONS) || !defined(VBOX_ONLY_BUILD))
+  PROGRAMS += vkatadd
  endif
 endif
@@ -186 +181 @@
 vkatadd_LIBS.solaris   = m
 
+
 #
 # Build the valkit vkat to bin as VBoxAudioTest, so that it can be shipped with
@@ -193 +189 @@
 #       vkat binary to bin/ directory but built this as an own binary.
 #
-ifdef VBOX_WITH_HOST_SHIPPING_AUDIO_TEST
- ifn1of ($(KBUILD_TARGET), os2 freebsd netbsd openbsd)
-  ifndef VBOX_ONLY_ADDITIONS
-   vkathost_TEMPLATE  := VBoxR3Exe
-   vkathost_EXTENDS   := vkat
-   vkathost_INST      := $(INST_BIN)
-   vkathost_NAME      := VBoxAudioTest
-   vkathost_SOURCES    = \
-        $(vkat_SOURCES) \
-        $(VBOX_PATH_SRC_DEVICES)/build/VBoxDD.d
-   vkathost_LIBS       = \
-        $(LIB_RUNTIME)
-  endif
- endif
-endif
+vkathost_TEMPLATE  := VBoxR3Exe
+vkathost_EXTENDS   := vkat
+vkathost_INST      := $(INST_BIN)
+vkathost_NAME      := VBoxAudioTest
+vkathost_SOURCES    = \
+        $(vkat_SOURCES) \
+        $(VBOX_PATH_SRC_DEVICES)/build/VBoxDD.d
+vkathost_LIBS       = \
+        $(LIB_RUNTIME)
+
 
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) \