linux: clean-up lib-files of base and base-common

Issue #1042
2025-04-28 06:49:47 +00:00 · 2014-02-11 18:11:01 +01:00 · 2014-02-11 18:11:01 +01:00 · 4f0a75b0bc
commit 4f0a75b0bc
parent 016c3a8d9e
6 changed files with 4 additions and 27 deletions
--- a/base-linux/lib/mk/arm/base.mk
+++ b/base-linux/lib/mk/arm/base.mk
@ -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
--- 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
--- a/base-linux/lib/mk/base.inc
+++ b/base-linux/lib/mk/base.inc
@ -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

--- a/base-linux/lib/mk/x86_32/base.mk
+++ b/base-linux/lib/mk/x86_32/base.mk
@ -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
--- a/base-linux/lib/mk/x86_64/base.mk
+++ b/base-linux/lib/mk/x86_64/base.mk
@ -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
--- 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