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

@@ -1,5 +0,0 @@
-SRC_CC += sinfo.cc
-
-vpath %.cc $(REP_DIR)/src/base/muen
-
-include $(REP_DIR)/lib/mk/base-hw-common.mk

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

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

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_ */

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