From a360452a104a0f53809b7f5959b416b5663c6777 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Wed, 14 Dec 2016 13:09:25 +0100
Subject: [PATCH] base: remove platform.mk and syscall.mk

The purpose of those libraries is now covered by the kernel-specific
syscall-<kernel> libraries.
---
 repos/base/lib/mk/platform.mk            |  0
 repos/base/lib/mk/startup.inc            |  1 -
 repos/base/lib/mk/syscall.mk             |  4 ----
 repos/base/mk/dep_lib.mk                 | 14 --------------
 repos/os/src/app/xvfb/target.mk          |  2 +-
 repos/os/src/lib/trace/policy/policy.inc |  2 --
 6 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 repos/base/lib/mk/platform.mk
 delete mode 100644 repos/base/lib/mk/syscall.mk

diff --git a/repos/base/lib/mk/platform.mk b/repos/base/lib/mk/platform.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/repos/base/lib/mk/startup.inc b/repos/base/lib/mk/startup.inc
index 42fe298249..f76e595c25 100644
--- a/repos/base/lib/mk/startup.inc
+++ b/repos/base/lib/mk/startup.inc
@@ -1,6 +1,5 @@
 SRC_S       += crt0.s
 SRC_CC      += _main.cc init_main_thread.cc
 REP_INC_DIR += src/include
-LIBS        += syscall
 
 vpath %.cc $(BASE_DIR)/src/lib/startup
diff --git a/repos/base/lib/mk/syscall.mk b/repos/base/lib/mk/syscall.mk
deleted file mode 100644
index 9916d81e35..0000000000
--- a/repos/base/lib/mk/syscall.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Pseudo syscall library used on platforms that do not need a library for
-# providing syscall bindings.
-#
diff --git a/repos/base/mk/dep_lib.mk b/repos/base/mk/dep_lib.mk
index c5abc31e82..6c953dcb72 100644
--- a/repos/base/mk/dep_lib.mk
+++ b/repos/base/mk/dep_lib.mk
@@ -96,20 +96,6 @@ else
 DEP_VAR_NAME := DEP_$(LIB).lib
 endif
 
-#
-# Add platform preparation dependency
-#
-# We make each leaf library depend on a library called 'platform'. This way,
-# the 'platform' library becomes a prerequisite of all other libraries. The
-# 'platform' library is supposed to take precautions for setting up
-# platform-specific build environments, e.g., preparing kernel API headers.
-#
-ifeq ($(LIBS),)
-ifneq ($(LIB),platform)
-LIBS += platform
-endif
-endif
-
 #
 # Check if the requirements of the target are satisfied
 #
diff --git a/repos/os/src/app/xvfb/target.mk b/repos/os/src/app/xvfb/target.mk
index 4429cc0f05..45e1c59d0b 100644
--- a/repos/os/src/app/xvfb/target.mk
+++ b/repos/os/src/app/xvfb/target.mk
@@ -1,6 +1,6 @@
 TARGET   = xvfb
 REQUIRES = linux x11 xtest xdamage
 SRC_CC   = main.cc inject_input.cc
-LIBS     = lx_hybrid syscall blit xev_track config
+LIBS     = lx_hybrid syscall-linux blit xev_track config
 
 EXT_OBJECTS += -lX11 -lXdamage /usr/lib/libXtst.so.6
diff --git a/repos/os/src/lib/trace/policy/policy.inc b/repos/os/src/lib/trace/policy/policy.inc
index cd6e7b9a66..b10ab253b3 100644
--- a/repos/os/src/lib/trace/policy/policy.inc
+++ b/repos/os/src/lib/trace/policy/policy.inc
@@ -14,8 +14,6 @@ LD_SCRIPT= $(PRG_DIR)/../policy.ld
 -include *.d
 -include ../*.d
 
-LIBS = platform
-
 table.o: table.cc
 	$(MSG_COMP)$@
 	$(VERBOSE)$(CXX) -c $(CC_MARCH) $(CXX_OPT) $(INCLUDES) $< -o $@