Merge remote-tracking branch 'origin/master' into staging

[qemu.git] / Makefile.hw

diff --git a/Makefile.hw b/Makefile.hw
index 830902bb6831486b6d8405d61e8fdf7158189813..b9181ab122b2d73bc66d8762eea460f47d5931b1 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -1,45 +1,24 @@
 # Makefile for qemu target independent devices.
 
 include ../config-host.mak
+include ../config-all-devices.mak
 include config.mak
 include $(SRC_PATH)/rules.mak
 
 .PHONY: all
 
-VPATH=$(SRC_PATH):$(SRC_PATH)/hw
+$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)
 
 QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu
 
-obj-y =
-obj-y += loader.o
-obj-y += virtio.o
-obj-y += fw_cfg.o
-obj-y += watchdog.o
-obj-y += nand.o ecc.o
+include $(SRC_PATH)/Makefile.objs
 
-obj-y += m48t59.o escc.o
-
-# PCI watchdog devices
-obj-y += wdt_i6300esb.o
-
-obj-y += msix.o
-
-# PCI network cards
-obj-y += ne2000.o
-
-# SCSI layer
-obj-y += lsi53c895a.o esp.o
-
-obj-y += dma-helpers.o sysbus.o qdev-addr.o isa-bus.o
-
-all: $(HWLIB)
+all: $(hw-obj-y)
 # Dummy command so that make thinks it has done something
        @true
 
-$(HWLIB): $(obj-y)
-
 clean:
-       rm -f *.o *.d *.a *~
+       rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~
 
 # Include automatically generated dependency files
 -include $(wildcard *.d */*.d)