From 0938d69192dd702ddd2c15c83ae29c8e862ffadc Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Tue, 17 Jan 2017 17:13:06 +0100
Subject: [PATCH] muen: Build sinfo code as static sinfo-muen library

And link it with core and virtualbox.
---
 repos/base-hw/lib/mk/spec/muen/base-hw-common.mk    | 5 -----
 repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk        | 4 ++++
 repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk | 2 ++
 repos/base-hw/src/{base => lib}/muen/musinfo.h      | 6 +++---
 repos/base-hw/src/{base => lib}/muen/sinfo.cc       | 0
 repos/ports/lib/mk/spec/muen/virtualbox-muen.mk     | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 repos/base-hw/lib/mk/spec/muen/base-hw-common.mk
 create mode 100644 repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk
 rename repos/base-hw/src/{base => lib}/muen/musinfo.h (94%)
 rename repos/base-hw/src/{base => lib}/muen/sinfo.cc (100%)

diff --git a/repos/base-hw/lib/mk/spec/muen/base-hw-common.mk b/repos/base-hw/lib/mk/spec/muen/base-hw-common.mk
deleted file mode 100644
index 2fb31c3c4..000000000
--- a/repos/base-hw/lib/mk/spec/muen/base-hw-common.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-SRC_CC += sinfo.cc
-
-vpath %.cc $(REP_DIR)/src/base/muen
-
-include $(REP_DIR)/lib/mk/base-hw-common.mk
diff --git a/repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk b/repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk
new file mode 100644
index 000000000..460c6fcfa
--- /dev/null
+++ b/repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk
@@ -0,0 +1,4 @@
+SRC_CC   = sinfo.cc
+INC_DIR += $(REP_DIR)/include/spec/x86_64/muen
+
+vpath sinfo.cc $(REP_DIR)/src/lib/muen
diff --git a/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk b/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk
index a33e7ced1..ffd560128 100644
--- a/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk
+++ b/repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk
@@ -20,5 +20,7 @@ SRC_CC += spec/x86_64/muen/kernel/vm.cc
 SRC_CC += spec/x86_64/muen/platform_services.cc
 SRC_CC += kernel/vm_thread_on.cc
 
+LIBS += sinfo-muen
+
 # include less specific configuration
 include $(REP_DIR)/lib/mk/spec/x86_64/core-hw.inc
diff --git a/repos/base-hw/src/base/muen/musinfo.h b/repos/base-hw/src/lib/muen/musinfo.h
similarity index 94%
rename from repos/base-hw/src/base/muen/musinfo.h
rename to repos/base-hw/src/lib/muen/musinfo.h
index 560576f03..68ddf7cce 100644
--- a/repos/base-hw/src/base/muen/musinfo.h
+++ b/repos/base-hw/src/lib/muen/musinfo.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _BASE__MUEN__MUSINFO_H_
-#define _BASE__MUEN__MUSINFO_H_
+#ifndef _LIB__MUEN__MUSINFO_H_
+#define _LIB__MUEN__MUSINFO_H_
 
 #include <base/stdint.h>
 
@@ -82,4 +82,4 @@ struct subject_info_type {
 	struct dev_info_type dev_info[MAX_RESOURCE_COUNT];
 } __attribute__((packed, aligned (8)));
 
-#endif /* _BASE__MUEN__MUSINFO_H_ */
+#endif /* _LIB__MUEN__MUSINFO_H_ */
diff --git a/repos/base-hw/src/base/muen/sinfo.cc b/repos/base-hw/src/lib/muen/sinfo.cc
similarity index 100%
rename from repos/base-hw/src/base/muen/sinfo.cc
rename to repos/base-hw/src/lib/muen/sinfo.cc
diff --git a/repos/ports/lib/mk/spec/muen/virtualbox-muen.mk b/repos/ports/lib/mk/spec/muen/virtualbox-muen.mk
index 31a2df9d1..8eebf1601 100644
--- a/repos/ports/lib/mk/spec/muen/virtualbox-muen.mk
+++ b/repos/ports/lib/mk/spec/muen/virtualbox-muen.mk
@@ -6,7 +6,7 @@ include $(REP_DIR)/lib/mk/virtualbox-common.inc
 #
 VBOX_CC_OPT += -include base/log.h
 
-LIBS  += stdcxx
+LIBS  += stdcxx sinfo-muen
 
 SRC_CC = pgm.cc sup.cc