Changeset 6693 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jan 31, 2008 10:22:17 PM (17 years ago)

Author:

vboxsync

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

27767

Message:

Replaced VBOXLNX32GUESTR0 by VBOXGUESTR0, VBOX_WITH_LINUX_ADDITIONS_32BIT_R0 by VBOX_WITH_ADDITION_DRIVERS, RuntimeLnx32GuestR0 by RuntimeW32GuestR0, and VBoxGuestLib[Base]Linux to VBoxGuestR0Lib[Base].

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (4 diffs)

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

@@ -20 +20 @@
 include $(PATH_KBUILD)/subheader.kmk
 
+#
+# Target config.
+#
 ifn1of ($(BUILD_TARGET),l4 linux win)
  LIBRARIES += \
@@ -45 +48 @@
  endif
  ifdef VBOX_WITH_LINUX_ADDITIONS
-  ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
    LIBRARIES += \
-        VBoxGuestLibLinux \
-        VBoxGuestLibBaseLinux
-  endif
-   LIBRARIES += \
+        VBoxGuestR0Lib \
+        VBoxGuestR0LibBase \
         VBoxGuestR3Lib \
         VBoxGuestR3LibShared \
@@ -57 +57 @@
  endif
 endif
+
+ifndef VBOX_WITH_ADDITION_DRIVERS
+ if1of ($(BUILD_TARGET), linux l4) # All drivers are optional, can skip RuntimeGuestR0.
+  LIBRARIES := $(filter-out VBoxGuestR0Lib VBoxGuestR0LibBase, $(LIBRARIES))
+ endif
+endif
+
 
 #
@@ -170 +177 @@
 
 #
-# VBoxGuestLibLinux
-#
-VBoxGuestLibLinux_TEMPLATE  = VBOXLNX32GUESTR0
-VBoxGuestLibLinux_SOURCES   = $(VBoxGuestR0Lib_SOURCES)
-VBoxGuestLibLinux_INCS      = $(VBoxGuestLib_INCS)
-VBoxGuestLibLinux_DEFS      = VBOX_HGCM LOG_TO_BACKDOOR
-
-
-#
-# VBoxGuestLibBaseLinux
-#
-VBoxGuestLibBaseLinux_TEMPLATE = VBOXLNX32GUESTR0
-VBoxGuestLibBaseLinux_SOURCES  = $(VBoxGuestR0LibBase_SOURCES)
-VBoxGuestLibBaseLinux_INCS     = $(VBoxGuestLib_INCS)
-VBoxGuestLibBaseLinux_DEFS     = VBOX_HGCM VBGL_VBOXGUEST LOG_TO_BACKDOOR
-
-#
 # VBoxGuestR3LibLinux
 #