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

[qemu.git] / Makefile.hw

diff --git a/Makefile.hw b/Makefile.hw
index a8c71740eb9b01b121d84ef35fed1a85dfb41b92..b9181ab122b2d73bc66d8762eea460f47d5931b1 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -1,36 +1,24 @@
 # Makefile for qemu target independent devices.
 
-include config.mak
 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
-
-CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS)
-LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS)
-
-CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
-CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CPPFLAGS+=-I$(SRC_PATH)/fpu
-
-OBJS=
-OBJS+= virtio.o virtio-pci.o
-OBJS+= fw_cfg.o
-OBJS+= watchdog.o
-OBJS+= nand.o ecc.o
-
-OBJS+= m48t59.o
+$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)
 
-OBJS+= dma-helpers.o sysbus.o
+QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu
 
-all: $(HWLIB)
+include $(SRC_PATH)/Makefile.objs
 
-$(HWLIB): $(OBJS)
+all: $(hw-obj-y)
+# Dummy command so that make thinks it has done something
+       @true
 
 clean:
-       rm -f *.o *.d *.a *~
+       rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~
 
 # Include automatically generated dependency files
 -include $(wildcard *.d */*.d)