base-linux: Repair hybrid programs

Do not link 'startup' and 'cxx' libraries against hybrid programs.

base-linux/lib/mk/base-common.mk

@@ -4,7 +4,7 @@
 # \date   2013-02-14
 #
 
-LIBS += startup syscall
+LIBS += syscall
 
 SRC_CC += ipc/ipc.cc
 SRC_CC += avl_tree/avl_tree.cc

base-linux/lib/mk/base.inc

@@ -0,0 +1,20 @@
+#
+# \brief  Portions of base library that are exclusive to non-core processes
+# \author Norman Feske
+# \date   2013-02-14
+#
+# The content of this file is used for both native Genode as well as hybrid
+# Linux/Genode programs. Hence, it must be void of any thread-related code.
+#
+
+LIBS += base-common syscall cxx
+
+SRC_CC += console/log_console.cc
+SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
+
+INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
+
+vpath %.cc  $(REP_DIR)/src/base
+vpath %.cc $(BASE_DIR)/src/base
+
+# vi:set ft=make :

base-linux/lib/mk/base.mk

@@ -1,19 +1,16 @@
 #
-# \brief  Portions of base library that are exclusive to non-core processes
-# \author Norman Feske
-# \date   2013-02-14
-#
-# The content of this file is used for both native Genode as well as hybrid
-# Linux/Genode programs. Hence, it must be void of any thread-related code.
+# \brief  Base lib parts that are not used by hybrid applications
+# \author Sebastian Sumpf
+# \date   2014-02-21
 #
 
-LIBS += base-common syscall cxx
+LIBS   += startup cxx
+SRC_CC += thread.cc thread_linux.cc
+
+vpath %.cc  $(REP_DIR)/src/base/thread
+vpath %.cc $(BASE_DIR)/src/base/thread
+
+include $(REP_DIR)/lib/mk/base.inc
 
-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
 
-vpath %.cc  $(REP_DIR)/src/base
-vpath %.cc $(BASE_DIR)/src/base