From d9143f805e2a7ea6e9d0ef2abbade04a63d206e5 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Sat, 4 May 2019 00:28:02 +0200
Subject: [PATCH] os: name rtc_drv unambigously (ref #2190)

---
 repos/os/src/drivers/rtc/{spec/x86 => }/main.cc       |  0
 repos/os/src/drivers/rtc/{spec/x86 => }/rtc.h         |  0
 .../drivers/rtc/spec/{x86/linux.cc => linux/rtc.cc}   |  0
 repos/os/src/drivers/rtc/spec/linux/target.mk         |  5 +++++
 repos/os/src/drivers/rtc/spec/x86/target.mk           | 11 ++---------
 repos/os/src/drivers/rtc/target.inc                   |  5 +++++
 6 files changed, 12 insertions(+), 9 deletions(-)
 rename repos/os/src/drivers/rtc/{spec/x86 => }/main.cc (100%)
 rename repos/os/src/drivers/rtc/{spec/x86 => }/rtc.h (100%)
 rename repos/os/src/drivers/rtc/spec/{x86/linux.cc => linux/rtc.cc} (100%)
 create mode 100644 repos/os/src/drivers/rtc/spec/linux/target.mk
 create mode 100644 repos/os/src/drivers/rtc/target.inc

diff --git a/repos/os/src/drivers/rtc/spec/x86/main.cc b/repos/os/src/drivers/rtc/main.cc
similarity index 100%
rename from repos/os/src/drivers/rtc/spec/x86/main.cc
rename to repos/os/src/drivers/rtc/main.cc
diff --git a/repos/os/src/drivers/rtc/spec/x86/rtc.h b/repos/os/src/drivers/rtc/rtc.h
similarity index 100%
rename from repos/os/src/drivers/rtc/spec/x86/rtc.h
rename to repos/os/src/drivers/rtc/rtc.h
diff --git a/repos/os/src/drivers/rtc/spec/x86/linux.cc b/repos/os/src/drivers/rtc/spec/linux/rtc.cc
similarity index 100%
rename from repos/os/src/drivers/rtc/spec/x86/linux.cc
rename to repos/os/src/drivers/rtc/spec/linux/rtc.cc
diff --git a/repos/os/src/drivers/rtc/spec/linux/target.mk b/repos/os/src/drivers/rtc/spec/linux/target.mk
new file mode 100644
index 0000000000..83580a428d
--- /dev/null
+++ b/repos/os/src/drivers/rtc/spec/linux/target.mk
@@ -0,0 +1,5 @@
+TARGET    = linux_rtc_drv
+REQUIRES  = x86
+LIBS      = lx_hybrid
+
+include $(REP_DIR)/src/drivers/rtc/target.inc
diff --git a/repos/os/src/drivers/rtc/spec/x86/target.mk b/repos/os/src/drivers/rtc/spec/x86/target.mk
index c4a16eefe3..3949da664c 100644
--- a/repos/os/src/drivers/rtc/spec/x86/target.mk
+++ b/repos/os/src/drivers/rtc/spec/x86/target.mk
@@ -1,12 +1,5 @@
 TARGET    = rtc_drv
 REQUIRES  = x86
-SRC_CC    = main.cc
+LIBS      = base
 
-# enforce hybrid prg on Linux
-ifeq ($(filter-out $(SPECS),linux),)
-LIBS    = lx_hybrid
-SRC_CC += linux.cc
-else
-LIBS    = base
-SRC_CC += rtc.cc
-endif
+include $(REP_DIR)/src/drivers/rtc/target.inc
diff --git a/repos/os/src/drivers/rtc/target.inc b/repos/os/src/drivers/rtc/target.inc
new file mode 100644
index 0000000000..49c4942c1c
--- /dev/null
+++ b/repos/os/src/drivers/rtc/target.inc
@@ -0,0 +1,5 @@
+SRC_CC    = main.cc rtc.cc
+INC_DIR  += $(REP_DIR)/src/drivers/rtc
+
+vpath main.cc $(REP_DIR)/src/drivers/rtc
+vpath rtc.cc  $(PRG_DIR)