diff options
author | Avi Kivity <avi@redhat.com> | 2009-12-02 12:48:32 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-12-02 12:48:32 +0200 |
commit | 2e88035e52dee6b6efac71fbd1432ed1c117eab8 (patch) | |
tree | 943ab9665347abb29fdf6eb3a47205f4adbb3a2f /Makefile | |
parent | kvm_handle_internal_error should return 1 (diff) | |
parent | Update SeaBIOS (diff) | |
download | qemu-kvm-2e88035e52dee6b6efac71fbd1432ed1c117eab8.tar.gz qemu-kvm-2e88035e52dee6b6efac71fbd1432ed1c117eab8.tar.bz2 qemu-kvm-2e88035e52dee6b6efac71fbd1432ed1c117eab8.zip |
Merge commit 'b0293e54af32bcf08f4b4e5b4b472534de343972' into upstream-merge
* commit 'b0293e54af32bcf08f4b4e5b4b472534de343972':
Update SeaBIOS
ARM atomic ops rewrite
ARM RealView I2C
GPIO I2C rework
DS1338 RTC
BCD cleanup
Makefile dependencies for device configs
target-mips: fix physical address type in MMU functions
[WIN32] Enable -k option on Windows too
target-mips: make CP0_LLAddr register CPU dependent
target-mips: rename CP0_LLAddr into lladdr
Conflicts:
pc-bios/bios.bin (pick upstream's)
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 21 |
1 files changed, 16 insertions, 5 deletions
@@ -1,7 +1,7 @@ # Makefile for QEMU. # This needs to be defined before rules.mak -GENERATED_HEADERS = config-host.h config-all-devices.h +GENERATED_HEADERS = config-host.h ifneq ($(wildcard config-host.mak),) # Put the all: rule here so that config-host.mak can contain dependencies. @@ -41,6 +41,19 @@ SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) config-all-devices.mak: $(SUBDIR_DEVICES_MAK) $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep "=y$$" | sort -u > $@," GEN $@") +%/config-devices.mak: default-configs/%.mak + $(call quiet-command,cat $< > $@.tmp, " GEN $@") + @if test -f $@ ; then \ + echo "WARNING: $@ out of date." ;\ + echo "Run \"make defconfing\" to regenerate." ; \ + rm $@.tmp ; \ + else \ + mv $@.tmp $@ ; \ + fi + +defconfig: + rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK) + -include config-all-devices.mak build-all: $(DOCS) $(TOOLS) recurse-all @@ -48,9 +61,6 @@ build-all: $(DOCS) $(TOOLS) recurse-all config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak -config-all-devices.h: config-all-devices.h-timestamp -config-all-devices.h-timestamp: config-all-devices.mak - SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) ifeq ($(KVM_KMOD),yes) @@ -135,6 +145,7 @@ obj-$(CONFIG_SSD0303) += ssd0303.o obj-$(CONFIG_SSD0323) += ssd0323.o obj-$(CONFIG_ADS7846) += ads7846.o obj-$(CONFIG_MAX111X) += max111x.o +obj-$(CONFIG_DS1338) += ds1338.o obj-y += i2c.o smbus.o smbus_eeprom.o obj-y += eeprom93xx.o obj-y += scsi-disk.o cdrom.o @@ -259,7 +270,7 @@ clean: distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi - rm -f config-all-devices.mak config-all-devices.h* + rm -f config-all-devices.mak rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f qemu-{doc,tech}.{info,aux,cp,dvi,fn,info,ky,log,pg,toc,tp,vr} for d in $(TARGET_DIRS) libhw32 libhw64 libuser; do \ |