Changeset 14730

Timestamp:

11/27/08 19:25:19 (1 month ago)

Author:

vboxsync

Message:

Main/USB: re-enable libhal on Linux hosts and get it right

Files:

• trunk/Config.kmk (modified) (2 diffs)
• trunk/src/VBox/Main/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Main/testcase/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -302 +302 @@
-# Enable statically linked libhal support for Linux
-ifeq ($(KBUILD_TARGET),linux)
-#
+
-endif
-# Disable WINMM support for Windows (not implemented)
@@ -1343 +1343 @@
-# libhal settings for Linux
-ifeq ($(KBUILD_TARGET),linux)
-$(VBOX_WITH_LIBHAL)
-?
-?= VBOX_LIBHAL_CFLAGS
-?
+VBOX_WITH_LIBHAL
+:
+:= $(VBOX_LIBHAL_CFLAGS)
+:
- endif
-endif

trunk/src/VBox/Main/Makefile.kmk

@@ -22 +22 @@
-SUB_DEPTH = ../../..
-include $(KBUILD_PATH)/subheader.kmk
-
-
-#

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -132 +132 @@
-        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)
-tstUSBLinux_LIBS     += $(PATH_OUT)/lib/USBLib.a
-ifeq ($(KBUILD_TARGET),linux)
- # Why on earth does this not work?  Config.kmk has an identical statement.
- VBOX_LIBHAL_LDFLAGS  ?= $(shell pkg-config hal --libs)
-endif
-tstUSBLinux_CFLAGS   += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CFLAGS),)
-tstUSBLinux_CXXFLAGS += $(if $(VBOX_WITH_LIBHAL),$(VBOX_LIBHAL_CXXFLAGS),)