Index: /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk	(revision 41720)
+++ /trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk	(revision 41721)
@@ -53,8 +53,8 @@
  VBoxGuest_INCS.linux    = ../../../Runtime/r0drv/linux
  ifeq ($(KBUILD_HOST),solaris)
-  VBoxGuest_LDFLAGS.solaris += -N misc/ctf
+  VBoxGuest_LDFLAGS.solaris       += -N misc/ctf
  else
-  VBoxGuest_SOURCES.solaris = solaris/deps.s
-  solaris/deps.s_ASFLAGS    = -f bin -g null
+  VBoxGuest_SOURCES.solaris        = solaris/deps.s
+  VBoxGuest_solaris/deps.s_ASFLAGS = -f bin -g null
  endif
  ifneq ($(KBUILD_TARGET),os2)
Index: /trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk	(revision 41720)
+++ /trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk	(revision 41721)
@@ -47,5 +47,10 @@
 	$(VBOX_LIB_VBGL_R0) \
 	$(VBOX_LIB_IPRT_GUEST_R0)
-vboxvideo_LDFLAGS      += -N misc/drm
+ifeq ($(KBUILD_HOST),solaris)
+ vboxvideo_LDFLAGS       += -N misc/drm
+else
+ vboxvideo_SOURCES       += deps.s
+ vboxvideo_deps.s_ASFLAGS = -f bin -g null
+endif
 
 
Index: /trunk/src/VBox/Additions/solaris/DRM/deps.s
===================================================================
--- /trunk/src/VBox/Additions/solaris/DRM/deps.s	(revision 41721)
+++ /trunk/src/VBox/Additions/solaris/DRM/deps.s	(revision 41721)
@@ -0,0 +1,37 @@
+; $Id$
+;; @file
+; Solaris kernel module dependency
+;
+
+;
+; Copyright (C) 2012 Oracle Corporation
+;
+; This file is part of VirtualBox Open Source Edition (OSE), as
+; available from http://www.virtualbox.org. This file is free software;
+; you can redistribute it and/or modify it under the terms of the GNU
+; General Public License (GPL) as published by the Free Software
+; Foundation, in version 2 as it comes in the "COPYING" file of the
+; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+;
+; The contents of this file may alternatively be used under the terms
+; of the Common Development and Distribution License Version 1.0
+; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+; VirtualBox OSE distribution, in which case the provisions of the
+; CDDL are applicable instead of those of the GPL.
+;
+; You may elect to license modified versions of this file under the
+; terms and conditions of either the GPL or the CDDL or both.
+;
+
+%include "iprt/solaris/kmoddeps.mac"
+
+kmoddeps_header  ; ELF header, section table and shared string table
+
+kmoddeps_dynstr_start  ; ELF .dynstr section
+kmoddeps_dynstr_string str_misc_ctf, "misc/ctf"
+kmoddeps_dynstr_end
+
+kmoddeps_dynamic_start  ; ELF .dynamic section
+kmoddeps_dynamic_needed str_misc_ctf
+kmoddeps_dynamic_end
Index: /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk	(revision 41720)
+++ /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk	(revision 41721)
@@ -47,5 +47,10 @@
 vboxfs_LIBS          = \
 	$(VBOX_LIB_VBGL_R0)
-vboxfs_LDFLAGS      += -N drv/vboxguest -N misc/ctf
+ifeq ($(KBUILD_HOST),solaris)
+ vboxfs_LDFLAGS.solaris += -N drv/vboxguest -N misc/ctf
+else
+ vboxfs_SOURCES         += deps.s
+ vboxfs_deps.s_ASFLAGS   = -f bin -g null
+endif
 if $(VBOX_SOLARIS_11_VERSION) >= 175
  && $(VBOX_SOLARIS_11_UPDATE_VERSION) >= 1
@@ -73,5 +78,10 @@
 	$(VBOX_LIB_VBGL_R0) \
 	$(VBOX_LIB_IPRT_GUEST_R0)
-vboxfs_s10_LDFLAGS      += -N drv/vboxguest -N misc/ctf
+ifeq ($(KBUILD_HOST),solaris)
+ vboxfs_s10_LDFLAGS       += -N drv/vboxguest -N misc/ctf
+else
+ vboxfs_s10_SOURCES       += deps.s
+ vboxfs_s10_deps.s_ASFLAGS = -f bin -g null
+endif
 endif # VBOX_OSE
 
Index: /trunk/src/VBox/Additions/solaris/SharedFolders/deps.s
===================================================================
--- /trunk/src/VBox/Additions/solaris/SharedFolders/deps.s	(revision 41721)
+++ /trunk/src/VBox/Additions/solaris/SharedFolders/deps.s	(revision 41721)
@@ -0,0 +1,39 @@
+; $Id$
+;; @file
+; Solaris kernel module dependency
+;
+
+;
+; Copyright (C) 2012 Oracle Corporation
+;
+; This file is part of VirtualBox Open Source Edition (OSE), as
+; available from http://www.virtualbox.org. This file is free software;
+; you can redistribute it and/or modify it under the terms of the GNU
+; General Public License (GPL) as published by the Free Software
+; Foundation, in version 2 as it comes in the "COPYING" file of the
+; VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+; hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+;
+; The contents of this file may alternatively be used under the terms
+; of the Common Development and Distribution License Version 1.0
+; (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+; VirtualBox OSE distribution, in which case the provisions of the
+; CDDL are applicable instead of those of the GPL.
+;
+; You may elect to license modified versions of this file under the
+; terms and conditions of either the GPL or the CDDL or both.
+;
+
+%include "iprt/solaris/kmoddeps.mac"
+
+kmoddeps_header  ; ELF header, section table and shared string table
+
+kmoddeps_dynstr_start  ; ELF .dynstr section
+kmoddeps_dynstr_string str_misc_ctf, "misc/ctf"
+kmoddeps_dynstr_string str_drv_vboxguest, "drv/vboxguest"
+kmoddeps_dynstr_end
+
+kmoddeps_dynamic_start  ; ELF .dynamic section
+kmoddeps_dynamic_needed str_misc_ctf
+kmoddeps_dynamic_needed str_drv_vboxguest
+kmoddeps_dynamic_end