Changeset 89634 in vbox

Timestamp:

Jun 11, 2021 6:09:07 PM (3 years ago)

Author:

vboxsync

Message:

src/VBox/Makefiles.kmk,src/VBoxValidationKit/utils/audio/Makefile.kmk: The sub-makefile should make sure it's Config.kmk files are included, not the parent (see src/VBox/ValidationKit/Makefile.kmk and other place). Keep the clutter in the high-level makefiles to a minimum. bugref:10008

Location:

trunk/src/VBox

Files:

• Makefile.kmk (modified) (1 diff)
• ValidationKit/utils/audio/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Makefile.kmk

@@ -29 +29 @@
  include $(PATH_SUB_CURRENT)/Additions/Makefile.kmk
 
- ifdef VBOX_WITH_VALIDATIONKIT
-  # Make sure our Config.kmk is included.
-  ifndef VBOX_VALIDATIONKIT_CONFIG_KMK_INCLUDED
-   include $(PATH_SUB_CURRENT)/ValidationKit/Config.kmk
-  endif
-  # For including VKAT with the Guest Additions.
+ ifdef VBOX_WITH_VALIDATIONKIT # For including VKAT with the Guest Additions.
   include $(PATH_SUB_CURRENT)/ValidationKit/utils/audio/Makefile.kmk
  endif

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

@@ -27 +27 @@
 SUB_DEPTH = ../../../../..
 include $(KBUILD_PATH)/subheader.kmk
+
+#
+# Make sure the ValKit config file is included when the additions build
+# is including just this makefile.
+#
+ifndef VBOX_VALIDATIONKIT_CONFIG_KMK_INCLUDED
+ include $(PATH_SUB_CURRENT)/ValidationKit/Config.kmk
+endif
 
 #