From f02e9001e8052dfc274eb1d2e0932f669c78f5ff Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Wed, 5 Mar 2014 17:05:44 +0100
Subject: [PATCH] vbox: fix dependencies of generated files

Express that the target binary files depend on the generated files not
the source files. The old expression seems to confuse Make, which then
logs a bogus error like the following

      COMPILE  Runtime/common/err/errmsg.o
  genode-x86-g++: error: Runtime/common/err/errmsg.cpp: No such file or directory
  genode-x86-g++: fatal error: no input files
  compilation terminated.
  make[2]: *** [Runtime/common/err/errmsg.o] Error 1
  make[1]: *** [virtualbox-runtime.lib] Error 2
---
 ports/lib/mk/virtualbox-devices.mk | 4 ++--
 ports/lib/mk/virtualbox-runtime.mk | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/lib/mk/virtualbox-devices.mk b/ports/lib/mk/virtualbox-devices.mk
index b9b7c29efc..44182648ab 100644
--- a/ports/lib/mk/virtualbox-devices.mk
+++ b/ports/lib/mk/virtualbox-devices.mk
@@ -44,7 +44,7 @@ CC_WARN += -Wno-unused-but-set-variable
 #
 CC_OPT += -DVBOX_WITH_HGSMI -DVBOX_WITH_WDDM -DVBOX_WITH_VDMA
 
-Devices/Graphics/DevVGA.cpp: vbetables.h
+Devices/Graphics/DevVGA.o: vbetables.h
 
 vbetables.h: vbetables-gen
 	$(MSG_CONVERT)$@
@@ -56,7 +56,7 @@ vbetables-gen: Devices/Graphics/BIOS/vbetables-gen.c
 
 
 
-Devices/PC/ACPI/VBoxAcpi.cpp: vboxaml.hex vboxssdt-standard.hex vboxssdt-cpuhotplug.hex
+Devices/PC/ACPI/VBoxAcpi.o: vboxaml.hex vboxssdt-standard.hex vboxssdt-cpuhotplug.hex
 
 vboxaml.hex: vbox.dsl
 	iasl -tc -vs -p $@ $^
diff --git a/ports/lib/mk/virtualbox-runtime.mk b/ports/lib/mk/virtualbox-runtime.mk
index 492dbd6f78..9b250869a1 100644
--- a/ports/lib/mk/virtualbox-runtime.mk
+++ b/ports/lib/mk/virtualbox-runtime.mk
@@ -111,7 +111,8 @@ SRC_S  += Runtime/common/asm/ASMAtomicUoReadU64.as
 SRC_S  += Runtime/common/asm/ASMAtomicXchgU64.asm
 
 SRC_CC += Runtime/common/err/errmsg.cpp
-Runtime/common/err/errmsg.cpp: errmsgdata.h
+Runtime/common/err/errmsg.o: errmsgdata.h
+
 errmsgdata.h: $(VIRTUALBOX_DIR)/include/iprt/err.h \
               $(VIRTUALBOX_DIR)/include/VBox/err.h
 	$(MSG_CONVERT)$@