diff --git a/base-hw/lib/mk/arm/base-common.mk b/base-hw/lib/mk/arm/base-common.mk new file mode 100644 index 0000000000..6ba7a51be4 --- /dev/null +++ b/base-hw/lib/mk/arm/base-common.mk @@ -0,0 +1,3 @@ +include $(REP_DIR)/lib/mk/base-common.inc + +vpath kernel/interface.cc $(REP_DIR)/src/arm diff --git a/base-hw/lib/mk/arm/kernel_interface.mk b/base-hw/lib/mk/arm/kernel_interface.mk deleted file mode 100644 index 824cb7e009..0000000000 --- a/base-hw/lib/mk/arm/kernel_interface.mk +++ /dev/null @@ -1,2 +0,0 @@ -SRC_CC = kernel/interface.cc -vpath % $(REP_DIR)/src/arm diff --git a/base-hw/lib/mk/base-common.mk b/base-hw/lib/mk/base-common.inc similarity index 92% rename from base-hw/lib/mk/base-common.mk rename to base-hw/lib/mk/base-common.inc index ac4a2233df..62202bf2ee 100644 --- a/base-hw/lib/mk/base-common.mk +++ b/base-hw/lib/mk/base-common.inc @@ -1,10 +1,11 @@ # # \brief Portions of base library shared by core and non-core processes # \author Norman Feske +# \author Martin Stein # \date 2013-02-14 # -LIBS += cxx kernel_interface +LIBS += cxx SRC_CC += ipc.cc ipc/ipc_marshal_cap.cc SRC_CC += avl_tree/avl_tree.cc @@ -20,6 +21,7 @@ SRC_CC += signal/signal.cc signal/common.cc SRC_CC += server/server.cc server/common.cc SRC_CC += thread/thread_bootstrap.cc thread/trace.cc SRC_CC += thread/context_allocator.cc +SRC_CC += kernel/interface.cc INC_DIR += $(REP_DIR)/src/base/lock INC_DIR += $(BASE_DIR)/src/base/lock