qcow2: Simplify calculation for COW area at the end

[qemu.git] / Makefile.hw

diff --git a/Makefile.hw b/Makefile.hw
index 6accb3bc72ccdf692f34276231dc3a58e2e9a7a1..2bcbaffb4f23f1e16e4c142d3ece65e481b42d23 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -1,41 +1,26 @@
 # Makefile for qemu target independent devices.
 
 # Makefile for qemu target independent devices.
 

-include config.mak

 include ../config-host.mak
 include ../config-host.mak

+include ../config-all-devices.mak
+include config.mak

 include $(SRC_PATH)/rules.mak
 
 .PHONY: all
 
 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.. -I$(SRC_PATH) -MMD -MP -MT $@
-CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CPPFLAGS+=-I$(SRC_PATH)/fpu
+$(call set-vpath, $(SRC_PATH))

 
 

-OBJS=
-OBJS+= virtio.o virtio-pci.o
-OBJS+= fw_cfg.o
-OBJS+= watchdog.o
-OBJS+= nand.o ecc.o
+QEMU_CFLAGS+=-I..
+QEMU_CFLAGS += -I$(SRC_PATH)/include

 
 

-OBJS+= m48t59.o escc.o
+include $(SRC_PATH)/Makefile.objs

 
 

-# SCSI layer
-OBJS+= lsi53c895a.o esp.o
-
-OBJS+= dma-helpers.o sysbus.o
-
-all: $(HWLIB)
+all: $(hw-obj-y)

 # Dummy command so that make thinks it has done something
        @true
 
 # Dummy command so that make thinks it has done something
        @true
 

-$(HWLIB): $(OBJS)
-

 clean:
 clean:

-       rm -f *.o *.d *.a *~
+       rm -f $(addsuffix /*.o, $(dir $(sort $(hw-obj-y))))
+       rm -f $(addsuffix /*.d, $(dir $(sort $(hw-obj-y))))

 
 # Include automatically generated dependency files
 
 # Include automatically generated dependency files

--include $(wildcard *.d */*.d)
+-include $(patsubst %.o, %.d, $(hw-obj-y))