Changeset 23848 in vbox

Timestamp:

Oct 19, 2009 9:21:19 AM (16 years ago)

Author:

vboxsync

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

53610

Message:

Main/D-Bus: Moved to VBox Runtime.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• linux/HostHardwareLinux.cpp (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -336 +336 @@
         linux/HostHardwareLinux.cpp
 
-ifdef VBOX_WITH_DBUS
- VBoxSVC_SOURCES.linux += linux/vbox-dbus.cpp
-endif
-
 VBoxSVC_SOURCES.solaris = \
         linux/vbox-libhal.cpp \

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -31 +31 @@
 
 #include <VBox/log.h>
+# ifdef VBOX_WITH_DBUS
+#  include <VBox/dbus.h>
+# endif
 
 #include <iprt/dir.h>
@@ -54 +57 @@
 # include <linux/fd.h>
 # include <linux/major.h>
-# ifdef VBOX_WITH_DBUS
-#  include <vbox-dbus.h>
-# endif
 # include <errno.h>
 # include <scsi/scsi.h>

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

@@ -125 +125 @@
 tstHostHardwareLinux_SOURCES   = \
         tstHostHardwareLinux.cpp \
-        ../linux/HostHardwareLinux.cpp \
-        ../linux/vbox-dbus.cpp
+        ../linux/HostHardwareLinux.cpp
 tstHostHardwareLinux_INCS      = . ../include
 tstHostHardwareLinux_DEFS      = \