From 70ee5a7efb6b566d840437a24edf0264e4d6c2ee Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Sat, 4 Aug 2012 10:21:22 +0100 Subject: [PATCH] Moved x86emu to {src,headers}/libs/. --- .../kernel/generic/bios => headers/libs}/x86emu/x86emu.h | 0 .../generic/bios => headers/libs}/x86emu/x86emu/debug.h | 0 .../generic/bios => headers/libs}/x86emu/x86emu/decode.h | 0 .../generic/bios => headers/libs}/x86emu/x86emu/fpu.h | 0 .../bios => headers/libs}/x86emu/x86emu/fpu_regs.h | 0 .../generic/bios => headers/libs}/x86emu/x86emu/ops.h | 0 .../bios => headers/libs}/x86emu/x86emu/prim_asm.h | 0 .../bios => headers/libs}/x86emu/x86emu/prim_ops.h | 0 .../bios => headers/libs}/x86emu/x86emu/prim_x86_gcc.h | 0 .../generic/bios => headers/libs}/x86emu/x86emu/regs.h | 0 .../generic/bios => headers/libs}/x86emu/x86emu/types.h | 0 .../generic/bios => headers/libs}/x86emu/x86emu/x86emui.h | 0 src/add-ons/kernel/generic/bios/Jamfile | 8 +++++++- src/{add-ons/kernel/generic/bios => libs}/x86emu/debug.c | 0 src/{add-ons/kernel/generic/bios => libs}/x86emu/decode.c | 0 src/{add-ons/kernel/generic/bios => libs}/x86emu/fpu.c | 0 src/{add-ons/kernel/generic/bios => libs}/x86emu/ops.c | 0 src/{add-ons/kernel/generic/bios => libs}/x86emu/ops2.c | 0 .../kernel/generic/bios => libs}/x86emu/prim_ops.c | 0 src/{add-ons/kernel/generic/bios => libs}/x86emu/sys.c | 0 .../kernel/generic/bios => libs}/x86emu/validate.c | 0 21 files changed, 7 insertions(+), 1 deletion(-) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/debug.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/decode.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/fpu.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/fpu_regs.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/ops.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/prim_asm.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/prim_ops.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/prim_x86_gcc.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/regs.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/types.h (100%) rename {src/add-ons/kernel/generic/bios => headers/libs}/x86emu/x86emu/x86emui.h (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/debug.c (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/decode.c (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/fpu.c (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/ops.c (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/ops2.c (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/prim_ops.c (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/sys.c (100%) rename src/{add-ons/kernel/generic/bios => libs}/x86emu/validate.c (100%) diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu.h b/headers/libs/x86emu/x86emu.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu.h rename to headers/libs/x86emu/x86emu.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/debug.h b/headers/libs/x86emu/x86emu/debug.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/debug.h rename to headers/libs/x86emu/x86emu/debug.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/decode.h b/headers/libs/x86emu/x86emu/decode.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/decode.h rename to headers/libs/x86emu/x86emu/decode.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu.h b/headers/libs/x86emu/x86emu/fpu.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu.h rename to headers/libs/x86emu/x86emu/fpu.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu_regs.h b/headers/libs/x86emu/x86emu/fpu_regs.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/fpu_regs.h rename to headers/libs/x86emu/x86emu/fpu_regs.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/ops.h b/headers/libs/x86emu/x86emu/ops.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/ops.h rename to headers/libs/x86emu/x86emu/ops.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_asm.h b/headers/libs/x86emu/x86emu/prim_asm.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_asm.h rename to headers/libs/x86emu/x86emu/prim_asm.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_ops.h b/headers/libs/x86emu/x86emu/prim_ops.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_ops.h rename to headers/libs/x86emu/x86emu/prim_ops.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_x86_gcc.h b/headers/libs/x86emu/x86emu/prim_x86_gcc.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/prim_x86_gcc.h rename to headers/libs/x86emu/x86emu/prim_x86_gcc.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/regs.h b/headers/libs/x86emu/x86emu/regs.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/regs.h rename to headers/libs/x86emu/x86emu/regs.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/types.h b/headers/libs/x86emu/x86emu/types.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/types.h rename to headers/libs/x86emu/x86emu/types.h diff --git a/src/add-ons/kernel/generic/bios/x86emu/x86emu/x86emui.h b/headers/libs/x86emu/x86emu/x86emui.h similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/x86emu/x86emui.h rename to headers/libs/x86emu/x86emu/x86emui.h diff --git a/src/add-ons/kernel/generic/bios/Jamfile b/src/add-ons/kernel/generic/bios/Jamfile index faa5ec4370..cab1336c9c 100644 --- a/src/add-ons/kernel/generic/bios/Jamfile +++ b/src/add-ons/kernel/generic/bios/Jamfile @@ -1,17 +1,23 @@ SubDir HAIKU_TOP src add-ons kernel generic bios ; +UseHeaders [ LibraryHeaders x86emu ] ; UsePrivateKernelHeaders ; SEARCH_SOURCE += [ FDirName $(SUBDIR) x86emu ] ; -KernelAddon bios : +local x86emuSources = decode.c fpu.c ops.c ops2.c prim_ops.c sys.c +; +KernelAddon bios : + $(x86emuSources) bios.cpp ; +SEARCH on [ FGristFiles $(x86emuSources) ] + = [ FDirName $(HAIKU_TOP) src libs x86emu ] ; diff --git a/src/add-ons/kernel/generic/bios/x86emu/debug.c b/src/libs/x86emu/debug.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/debug.c rename to src/libs/x86emu/debug.c diff --git a/src/add-ons/kernel/generic/bios/x86emu/decode.c b/src/libs/x86emu/decode.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/decode.c rename to src/libs/x86emu/decode.c diff --git a/src/add-ons/kernel/generic/bios/x86emu/fpu.c b/src/libs/x86emu/fpu.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/fpu.c rename to src/libs/x86emu/fpu.c diff --git a/src/add-ons/kernel/generic/bios/x86emu/ops.c b/src/libs/x86emu/ops.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/ops.c rename to src/libs/x86emu/ops.c diff --git a/src/add-ons/kernel/generic/bios/x86emu/ops2.c b/src/libs/x86emu/ops2.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/ops2.c rename to src/libs/x86emu/ops2.c diff --git a/src/add-ons/kernel/generic/bios/x86emu/prim_ops.c b/src/libs/x86emu/prim_ops.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/prim_ops.c rename to src/libs/x86emu/prim_ops.c diff --git a/src/add-ons/kernel/generic/bios/x86emu/sys.c b/src/libs/x86emu/sys.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/sys.c rename to src/libs/x86emu/sys.c diff --git a/src/add-ons/kernel/generic/bios/x86emu/validate.c b/src/libs/x86emu/validate.c similarity index 100% rename from src/add-ons/kernel/generic/bios/x86emu/validate.c rename to src/libs/x86emu/validate.c