diff options
| author | Paul Brook | 2009-07-31 14:18:32 +0200 |
|---|---|---|
| committer | Paul Brook | 2009-07-31 14:19:39 +0200 |
| commit | c05ac895cb59b5549e9b59314f9c791c68d97bfd (patch) | |
| tree | d7d5a8e042f715ec51fab5bb5b7fc8711b0b09c6 /Makefile | |
| parent | Save/restore ARMv6 MMU state (diff) | |
| download | qemu-c05ac895cb59b5549e9b59314f9c791c68d97bfd.tar.gz qemu-c05ac895cb59b5549e9b59314f9c791c68d97bfd.tar.xz qemu-c05ac895cb59b5549e9b59314f9c791c68d97bfd.zip | |
Option rom makefile fixes
Fix toplevel option rom makefile rules.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -38,7 +38,7 @@ ifdef CONFIG_WIN32 LIBS+=-lwinmm -lws2_32 -liphlpapi endif -build-all: $(TOOLS) $(DOCS) roms recurse-all +build-all: $(TOOLS) $(DOCS) recurse-all config-host.mak: configure ifneq ($(wildcard config-host.mak),) @@ -55,7 +55,14 @@ subdir-%: $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a -recurse-all: $(SUBDIR_RULES) + +ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) +romsubdir-%: + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/",) + +ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) + +recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img @@ -220,7 +227,7 @@ clean: rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d rm -f qemu-img-cmds.h $(MAKE) -C tests clean - for d in $(TARGET_DIRS) $(ROMS) libhw32 libhw64; do \ + for d in $(ALL_SUBDIRS) libhw32 libhw64; do \ $(MAKE) -C $$d $@ || exit 1 ; \ done @@ -245,11 +252,6 @@ else BLOBS= endif -roms: - for d in $(ROMS); do \ - $(MAKE) -C $$d || exit 1 ; \ - done - install-doc: $(DOCS) $(INSTALL_DIR) "$(DESTDIR)$(docdir)" $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" |