Introduce and use cache-utils.[ch]

[mirror_qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 49e439883d5ace84ee315b5dcc907f3ab573d4e7..a2a03ec3e22c73c235e267312b8f68711303a732 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ all: $(TOOLS) $(DOCS) recurse-all
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
 
-subdir-%: dyngen$(EXESUF)
+subdir-%:
        $(MAKE) -C $(subst subdir-,,$@) all
 
 $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
@@ -59,10 +59,6 @@ else
 BLOCK_OBJS += block-raw-posix.o
 endif
 
-ifdef CONFIG_AIO
-BLOCK_OBJS += compatfd.o
-endif
-
 ######################################################################
 # libqemu_common.a: Target independent part of system emulation. The
 # long term path is to suppress *all* target specific code in case of
@@ -78,10 +74,12 @@ OBJS+=ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o
 OBJS+=tmp105.o lm832x.o
 OBJS+=scsi-disk.o cdrom.o
 OBJS+=scsi-generic.o
-OBJS+=usb.o usb-hub.o usb-linux.o usb-hid.o usb-msd.o usb-wacom.o
+OBJS+=usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
 OBJS+=usb-serial.o usb-net.o
 OBJS+=sd.o ssi-sd.o
-OBJS+=bt.o bt-host.o
+OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
+OBJS+=buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o
+OBJS+=qemu-char.o aio.o net-checksum.o savevm.o cache-utils.o
 
 ifdef CONFIG_BRLAPI
 OBJS+= baum.o
@@ -90,6 +88,8 @@ endif
 
 ifdef CONFIG_WIN32
 OBJS+=tap-win32.o
+else
+OBJS+=migration-exec.o
 endif
 
 AUDIO_OBJS = audio.o noaudio.o wavaudio.o mixeng.o
@@ -178,7 +178,7 @@ libqemu_common.a: $(OBJS)
 
 #######################################################################
 # USER_OBJS is code used by qemu userspace emulation
-USER_OBJS=cutils.o
+USER_OBJS=cutils.o  cache-utils.o
 
 libqemu_user.a: $(USER_OBJS)
        rm -f $@ 
@@ -195,15 +195,10 @@ qemu-img$(EXESUF): qemu-img.o qemu-tool.o osdep.o $(BLOCK_OBJS)
 qemu-nbd$(EXESUF):  qemu-nbd.o qemu-tool.o osdep.o $(BLOCK_OBJS)
        $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
 
-# dyngen host tool
-dyngen$(EXESUF): dyngen.c
-       $(HOST_CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^
-
 clean:
 # avoid old build problems by removing potentially incorrect old files
        rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
-       rm -f *.o *.d *.a $(TOOLS) dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~
-       rm -rf dyngen.dSYM
+       rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
        rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d
        $(MAKE) -C tests clean
        for d in $(TARGET_DIRS); do \
@@ -221,6 +216,14 @@ KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \
 ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
 common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
 
+ifdef INSTALL_BLOBS
+BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+video.x openbios-sparc32 openbios-sparc64 pxe-ne2k_pci.bin \
+pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin
+else
+BLOBS=
+endif
+
 install-doc: $(DOCS)
        mkdir -p "$(DESTDIR)$(docdir)"
        $(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
@@ -236,12 +239,12 @@ install: all $(if $(BUILD_DOCS),install-doc)
 ifneq ($(TOOLS),)
        $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
+ifneq ($(BLOBS),)
        mkdir -p "$(DESTDIR)$(datadir)"
-       set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
-               video.x openbios-sparc32 openbios-sparc64 pxe-ne2k_pci.bin \
-               pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin; do \
+       set -e; for x in $(BLOBS); do \
                $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
        done
+endif
 ifndef CONFIG_WIN32
        mkdir -p "$(DESTDIR)$(datadir)/keymaps"
        set -e; for x in $(KEYMAPS); do \
@@ -261,7 +264,7 @@ TAGS:
 
 cscope:
        rm -f ./cscope.*
-       find . -name "*.[ch]" -print > ./cscope.files
+       find . -name "*.[ch]" -print | sed 's,^\./,,' > ./cscope.files
        cscope -b
 
 # documentation