diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-05-21 15:54:48 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-05-21 15:54:48 +0000 |
| commit | 2567f5796c38238d6f2055f074e347a0338140ce (patch) | |
| tree | 8ee44d39f02e63e417dfc2468fa0a90e3cc4ca94 | |
| parent | e20a8dff4c0da3827764924139d3bb73962f5d5a (diff) | |
| download | focaccia-qemu-2567f5796c38238d6f2055f074e347a0338140ce.tar.gz focaccia-qemu-2567f5796c38238d6f2055f074e347a0338140ce.zip | |
Compile most Xen files only once
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.target | 3 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | hw/xen_backend.c | 1 |
4 files changed, 14 insertions, 2 deletions
diff --git a/Makefile b/Makefile index bbb5e9107b..e993ec6dd1 100644 --- a/Makefile +++ b/Makefile @@ -189,6 +189,13 @@ endif LIBS+=$(VDE_LIBS) +# xen backend driver support +XEN_OBJS := xen_backend.o xen_devconfig.o +XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o +ifdef CONFIG_XEN + OBJS += $(XEN_OBJS) +endif + cocoa.o: cocoa.m keymaps.o: keymaps.c keymaps.h diff --git a/Makefile.target b/Makefile.target index f327bf2f44..4de29f831d 100644 --- a/Makefile.target +++ b/Makefile.target @@ -541,8 +541,7 @@ LIBS += $(CONFIG_BLUEZ_LIBS) endif # xen backend driver support -XEN_OBJS := xen_machine_pv.o xen_backend.o xen_devconfig.o xen_domainbuild.o -XEN_OBJS += xen_console.o xenfb.o xen_disk.o xen_nic.o +XEN_OBJS := xen_machine_pv.o xen_domainbuild.o ifeq ($(CONFIG_XEN), yes) OBJS += $(XEN_OBJS) LIBS += $(XEN_LIBS) diff --git a/configure b/configure index 186e535768..36596ba96b 100755 --- a/configure +++ b/configure @@ -1708,6 +1708,11 @@ else exit 1 fi +if test "$xen" = "yes" ; + then + echo "CONFIG_XEN=yes" >> $config_mak +fi + tools= if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then tools="qemu-img\$(EXESUF) $tools" diff --git a/hw/xen_backend.c b/hw/xen_backend.c index 2f2ec7ffe0..76d07ecd38 100644 --- a/hw/xen_backend.c +++ b/hw/xen_backend.c @@ -38,6 +38,7 @@ #include "hw.h" #include "qemu-char.h" +#include "qemu-log.h" #include "xen_backend.h" /* ------------------------------------------------------------- */ |