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 000000000..83580a428 --- /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 c4a16eefe..3949da664 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 000000000..49c4942c1 --- /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)