Changeset 6129 in vbox for trunk/src/VBox

Timestamp:

Dec 18, 2007 3:26:46 PM (17 years ago)

Author:

vboxsync

Message:

Implemented VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER. Started cleaning up the additions build config mess.

Location:

trunk/src/VBox

Files:

• Makefile.kmk (modified) (1 diff)
• Runtime/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Makefile.kmk

@@ -44 +44 @@
  endif
 
- ifndef VBOX_WITHOUT_ADDITIONS
-  ifneq ($(VBOX_WITH_WIN32_ADDITIONS)$(VBOX_WITH_LINUX_ADDITIONS)$(VBOX_WITH_SOLARIS_ADDITIONS),)
-   SUBDIRS += Additions
-  endif
+ ifdef VBOX_WITH_ADDITIONS
+  SUBDIRS += Additions
  endif
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -52 +52 @@
 else ifdef VBOX_ADDITIONS_WIN32_ONLY
  LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
-else ifdef VBOX_ADDITIONS_OS2_ONLY
- LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR0
 else
 
@@ -64 +62 @@
   LIBRARIES += RuntimeR0Drv
  endif
- ifndef VBOX_WITHOUT_ADDITIONS
-  ifdef VBOX_WITH_WIN32_ADDITIONS
-   LIBRARIES += RuntimeW32GuestR0   RuntimeW32GuestR3 RuntimeW32NT4GuestR0
-  endif
-  ifdef VBOX_WITH_LINUX_ADDITIONS
-   LIBRARIES += RuntimeLnx32GuestR3
-   ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
-    LIBRARIES += RuntimeLnx32GuestR0
+ ifdef VBOX_WITH_ADDITIONS
+  if1of ($(BUILD_TARGET),linux l4 windows)
+   ifdef VBOX_WITH_WIN32_ADDITIONS
+    LIBRARIES += RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
    endif
-  endif
-  ifdef VBOX_WITH_OS2_ADDITIONS
-   LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR0
-  endif
-  ifn1of ($(BUILD_TARGET),win os2 linux)
+   ifdef VBOX_WITH_LINUX_ADDITIONS
+    LIBRARIES += RuntimeLnx32GuestR3
+    ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
+     LIBRARIES += RuntimeLnx32GuestR0
+    endif
+   endif
+  else ifeq ($(BUILD_TARGET),os2) ## @todo RuntimeOS2Guest* -> RuntimeGuest*
+   LIBRARIES += RuntimeOS2GuestR0 RuntimeOS2GuestR3
+  else
    LIBRARIES += RuntimeGuestR0 RuntimeGuestR3
   endif
- endif # !VBOX_WITHOUT_ADDITIONS
+  #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0
+ endif # VBOX_WITH_ADDITIONS
  LIBRARIES.l4 = RuntimeR3L4
  DLLS = VBoxRT