repository: /home/avi/kvm
branch: master
commit 3878356dcb38f60bd83ffc4db1af6f32c5d0b340
Author: Avi Kivity <[EMAIL PROTECTED]>
Date: Mon Nov 26 17:37:25 2007 +0200
kvm: testsuite: move suport files to libcflat.a
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/user/config-x86-common.mak b/user/config-x86-common.mak
index a6253ce..ace859b 100644
--- a/user/config-x86-common.mak
+++ b/user/config-x86-common.mak
@@ -12,31 +12,28 @@ tests-common = $(TEST_DIR)/bootstrap \
test_cases: $(tests-common) $(tests)
-$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding
+$(TEST_DIR)/%.o: CFLAGS += -std=gnu99 -ffreestanding -I$(TEST_DIR)/lib
$(TEST_DIR)/bootstrap: $(TEST_DIR)/bootstrap.o
$(CC) -nostdlib -o $@ -Wl,-T,bootstrap.lds $^
$(TEST_DIR)/irq.flat: $(TEST_DIR)/print.o
-$(TEST_DIR)/access.flat: $(cstart.o) $(TEST_DIR)/access.o \
- $(TEST_DIR)/printf.o $(TEST_DIR)/print.o $(TEST_DIR)/smp.o
+$(TEST_DIR)/access.flat: $(cstart.o) $(TEST_DIR)/access.o $(TEST_DIR)/print.o
$(TEST_DIR)/sieve.flat: $(cstart.o) $(TEST_DIR)/sieve.o \
$(TEST_DIR)/print.o $(TEST_DIR)/vm.o
-$(TEST_DIR)/vmexit.flat: $(cstart.o) $(TEST_DIR)/vmexit.o \
- $(TEST_DIR)/printf.o $(TEST_DIR)/smp.o
+$(TEST_DIR)/vmexit.flat: $(cstart.o) $(TEST_DIR)/vmexit.o
$(TEST_DIR)/test32.flat: $(TEST_DIR)/test32.o
-$(TEST_DIR)/smp.flat: $(cstart.o) $(TEST_DIR)/smp.o $(TEST_DIR)/printf.o \
- $(TEST_DIR)/smptest.o
+$(TEST_DIR)/smp.flat: $(cstart.o) $(TEST_DIR)/smptest.o
-$(TEST_DIR)/emulator.flat: $(cstart.o) $(TEST_DIR)/printf.o $(TEST_DIR)/vm.o \
- $(TEST_DIR)/smp.o $(TEST_DIR)/print.o
+$(TEST_DIR)/emulator.flat: $(cstart.o) $(TEST_DIR)/vm.o $(TEST_DIR)/print.o
-$(TEST_DIR)/libcflat.a: $(TEST_DIR)/lib/exit.o
+$(TEST_DIR)/libcflat.a: $(TEST_DIR)/lib/exit.o $(TEST_DIR)/lib/printf.o \
+ $(TEST_DIR)/lib/smp.o
ar rcs $@ $^
arch_clean:
diff --git a/user/main.c b/user/main.c
index 59c369e..213b019 100644
--- a/user/main.c
+++ b/user/main.c
@@ -17,7 +17,7 @@
#define _GNU_SOURCE
#include <libkvm.h>
-#include "test/x86/apic.h"
+#include "test/x86/lib/apic.h"
#include "test/x86/ioram.h"
#include <stdio.h>
diff --git a/user/test/x86/apic.h b/user/test/x86/lib/apic.h
similarity index 100%
rename from user/test/x86/apic.h
rename to user/test/x86/lib/apic.h
diff --git a/user/test/x86/printf.c b/user/test/x86/lib/printf.c
similarity index 100%
rename from user/test/x86/printf.c
rename to user/test/x86/lib/printf.c
diff --git a/user/test/x86/printf.h b/user/test/x86/lib/printf.h
similarity index 100%
rename from user/test/x86/printf.h
rename to user/test/x86/lib/printf.h
diff --git a/user/test/x86/smp.c b/user/test/x86/lib/smp.c
similarity index 100%
rename from user/test/x86/smp.c
rename to user/test/x86/lib/smp.c
diff --git a/user/test/x86/smp.h b/user/test/x86/lib/smp.h
similarity index 100%
rename from user/test/x86/smp.h
rename to user/test/x86/lib/smp.h
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
