← Back to branch summary

~ubuntu-branches/ubuntu/saucy/qemu/saucy-proposed

« back to all changes in this revision

Viewing changes to Makefile.target

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-05-28 08:18:30 UTC
  • mfrom: (1.8.2) (10.1.37 sid)
  • Revision ID: package-import@ubuntu.com-20130528081830-87xl2z9fq516a814
Tags: 1.5.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.5.0+dfs-2 from debian unstable.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - Dropped patches:
    * 0001-fix-wrong-output-with-info-chardev-for-tcp-socket.patch
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * gridcentric patch - updated
    * linaro arm patches from qemu-linaro rebasing branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.target
1
1
# -*- Mode: makefile -*-
2
2
 
3
3
include ../config-host.mak
 
4
include config-target.mak
4
5
include config-devices.mak
5
 
include config-target.mak
6
6
include $(SRC_PATH)/rules.mak
7
7
 
8
8
$(call set-vpath, $(SRC_PATH))
18
18
QEMU_PROG=qemu-$(TARGET_ARCH2)
19
19
else
20
20
# system emulator name
21
 
ifneq (,$(findstring -mwindows,$(LIBS)))
 
21
ifneq (,$(findstring -mwindows,$(libs_softmmu)))
22
22
# Terminate program name with a 'w' because the linker builds a windows executable.
23
23
QEMU_PROGW=qemu-system-$(TARGET_ARCH2)w$(EXESUF)
24
24
endif # windows executable
31
31
endif
32
32
STPFILES=
33
33
 
34
 
ifndef CONFIG_HAIKU
35
 
LIBS+=-lm
36
 
endif
37
 
 
38
34
config-target.h: config-target.h-timestamp
39
35
config-target.h-timestamp: config-target.mak
40
36
 
64
60
# Dummy command so that make thinks it has done something
65
61
        @true
66
62
 
 
63
CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
 
64
CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
 
65
CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
 
66
CONFIG_NO_GET_MEMORY_MAPPING = $(if $(subst n,,$(CONFIG_HAVE_GET_MEMORY_MAPPING)),n,y)
 
67
CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y)
 
68
 
67
69
#########################################################
68
70
# cpu emulator library
69
71
obj-y = exec.o translate-all.o cpu-exec.o
74
76
obj-y += target-$(TARGET_BASE_ARCH)/
75
77
obj-y += disas.o
76
78
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
 
79
obj-$(CONFIG_NO_KVM) += kvm-stub.o
77
80
 
78
81
#########################################################
79
82
# Linux user emulator target
102
105
#########################################################
103
106
# System emulator target
104
107
ifdef CONFIG_SOFTMMU
105
 
CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
106
 
CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
107
 
CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
108
 
CONFIG_NO_GET_MEMORY_MAPPING = $(if $(subst n,,$(CONFIG_HAVE_GET_MEMORY_MAPPING)),n,y)
109
 
CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y)
110
 
 
111
108
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o
 
109
obj-y += qtest.o
112
110
obj-y += hw/
 
111
obj-$(CONFIG_FDT) += device_tree.o
113
112
obj-$(CONFIG_KVM) += kvm-all.o
114
 
obj-$(CONFIG_NO_KVM) += kvm-stub.o
115
113
obj-y += memory.o savevm.o cputlb.o
116
114
obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o
117
115
obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o
118
116
obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
119
117
obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o
120
 
LIBS+=-lz
 
118
LIBS+=$(libs_softmmu)
121
119
 
122
120
# xen support
123
121
obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
147
145
all-obj-y = $(obj-y)
148
146
all-obj-y += $(addprefix ../, $(common-obj-y))
149
147
 
 
148
ifndef CONFIG_HAIKU
 
149
LIBS+=-lm
 
150
endif
 
151
 
150
152
ifdef QEMU_PROGW
151
153
# The linker builds a windows executable. Make also a console executable.
152
154
$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a