From 4f0a75b0bc187d0e40da70dfa98f61d3b772ef6b Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Tue, 11 Feb 2014 18:11:01 +0100 Subject: [PATCH] linux: clean-up lib-files of base and base-common Issue #1042 --- base-linux/lib/mk/arm/base.mk | 8 -------- base-linux/lib/mk/base-common.mk | 2 +- base-linux/lib/mk/{base.inc => base.mk} | 3 ++- base-linux/lib/mk/x86_32/base.mk | 8 -------- base-linux/lib/mk/x86_64/base.mk | 8 -------- base-linux/src/core/target.mk | 2 +- 6 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 base-linux/lib/mk/arm/base.mk rename base-linux/lib/mk/{base.inc => base.mk} (85%) delete mode 100644 base-linux/lib/mk/x86_32/base.mk delete mode 100644 base-linux/lib/mk/x86_64/base.mk diff --git a/base-linux/lib/mk/arm/base.mk b/base-linux/lib/mk/arm/base.mk deleted file mode 100644 index aae6655f0..000000000 --- a/base-linux/lib/mk/arm/base.mk +++ /dev/null @@ -1,8 +0,0 @@ -include $(REP_DIR)/lib/mk/base.inc - -LIBS += startup cxx - -SRC_CC += thread.cc thread_linux.cc - -vpath thread.cc $(BASE_DIR)/src/base/thread -vpath thread_linux.cc $(REP_DIR)/src/base/thread diff --git a/base-linux/lib/mk/base-common.mk b/base-linux/lib/mk/base-common.mk index 5077a5d61..5eba2dd54 100644 --- a/base-linux/lib/mk/base-common.mk +++ b/base-linux/lib/mk/base-common.mk @@ -4,7 +4,7 @@ # \date 2013-02-14 # -LIBS += syscall +LIBS += startup syscall SRC_CC += ipc/ipc.cc SRC_CC += avl_tree/avl_tree.cc diff --git a/base-linux/lib/mk/base.inc b/base-linux/lib/mk/base.mk similarity index 85% rename from base-linux/lib/mk/base.inc rename to base-linux/lib/mk/base.mk index 425110501..f9bb27827 100644 --- a/base-linux/lib/mk/base.inc +++ b/base-linux/lib/mk/base.mk @@ -7,10 +7,11 @@ # Linux/Genode programs. Hence, it must be void of any thread-related code. # -LIBS += base-common syscall +LIBS += base-common syscall cxx SRC_CC += console/log_console.cc SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc +SRC_CC += thread/thread.cc thread/thread_linux.cc INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env diff --git a/base-linux/lib/mk/x86_32/base.mk b/base-linux/lib/mk/x86_32/base.mk deleted file mode 100644 index aae6655f0..000000000 --- a/base-linux/lib/mk/x86_32/base.mk +++ /dev/null @@ -1,8 +0,0 @@ -include $(REP_DIR)/lib/mk/base.inc - -LIBS += startup cxx - -SRC_CC += thread.cc thread_linux.cc - -vpath thread.cc $(BASE_DIR)/src/base/thread -vpath thread_linux.cc $(REP_DIR)/src/base/thread diff --git a/base-linux/lib/mk/x86_64/base.mk b/base-linux/lib/mk/x86_64/base.mk deleted file mode 100644 index aae6655f0..000000000 --- a/base-linux/lib/mk/x86_64/base.mk +++ /dev/null @@ -1,8 +0,0 @@ -include $(REP_DIR)/lib/mk/base.inc - -LIBS += startup cxx - -SRC_CC += thread.cc thread_linux.cc - -vpath thread.cc $(BASE_DIR)/src/base/thread -vpath thread_linux.cc $(REP_DIR)/src/base/thread diff --git a/base-linux/src/core/target.mk b/base-linux/src/core/target.mk index 2c32c381f..7d69d80c6 100644 --- a/base-linux/src/core/target.mk +++ b/base-linux/src/core/target.mk @@ -1,6 +1,6 @@ TARGET = core REQUIRES = linux -LIBS = cxx base-common syscall startup +LIBS = cxx base-common syscall GEN_CORE_DIR = $(BASE_DIR)/src/core