Commit c05ac895cb59b5549e9b59314f9c791c68d97bfd
1 parent
ffe47d33
Option rom makefile fixes
Fix toplevel option rom makefile rules. Signed-off-by: Paul Brook <paul@codesourcery.com>
Showing
3 changed files
with
13 additions
and
9 deletions
Makefile
| @@ -38,7 +38,7 @@ ifdef CONFIG_WIN32 | @@ -38,7 +38,7 @@ ifdef CONFIG_WIN32 | ||
| 38 | LIBS+=-lwinmm -lws2_32 -liphlpapi | 38 | LIBS+=-lwinmm -lws2_32 -liphlpapi |
| 39 | endif | 39 | endif |
| 40 | 40 | ||
| 41 | -build-all: $(TOOLS) $(DOCS) roms recurse-all | 41 | +build-all: $(TOOLS) $(DOCS) recurse-all |
| 42 | 42 | ||
| 43 | config-host.mak: configure | 43 | config-host.mak: configure |
| 44 | ifneq ($(wildcard config-host.mak),) | 44 | ifneq ($(wildcard config-host.mak),) |
| @@ -55,7 +55,14 @@ subdir-%: | @@ -55,7 +55,14 @@ subdir-%: | ||
| 55 | $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a | 55 | $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a |
| 56 | $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a | 56 | $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a |
| 57 | 57 | ||
| 58 | -recurse-all: $(SUBDIR_RULES) | 58 | + |
| 59 | +ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS)) | ||
| 60 | +romsubdir-%: | ||
| 61 | + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pc-bios/$* V="$(V)" TARGET_DIR="$*/",) | ||
| 62 | + | ||
| 63 | +ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) | ||
| 64 | + | ||
| 65 | +recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) | ||
| 59 | 66 | ||
| 60 | ####################################################################### | 67 | ####################################################################### |
| 61 | # block-obj-y is code used by both qemu system emulation and qemu-img | 68 | # block-obj-y is code used by both qemu system emulation and qemu-img |
| @@ -220,7 +227,7 @@ clean: | @@ -220,7 +227,7 @@ clean: | ||
| 220 | rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d | 227 | rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d |
| 221 | rm -f qemu-img-cmds.h | 228 | rm -f qemu-img-cmds.h |
| 222 | $(MAKE) -C tests clean | 229 | $(MAKE) -C tests clean |
| 223 | - for d in $(TARGET_DIRS) $(ROMS) libhw32 libhw64; do \ | 230 | + for d in $(ALL_SUBDIRS) libhw32 libhw64; do \ |
| 224 | $(MAKE) -C $$d $@ || exit 1 ; \ | 231 | $(MAKE) -C $$d $@ || exit 1 ; \ |
| 225 | done | 232 | done |
| 226 | 233 | ||
| @@ -245,11 +252,6 @@ else | @@ -245,11 +252,6 @@ else | ||
| 245 | BLOBS= | 252 | BLOBS= |
| 246 | endif | 253 | endif |
| 247 | 254 | ||
| 248 | -roms: | ||
| 249 | - for d in $(ROMS); do \ | ||
| 250 | - $(MAKE) -C $$d || exit 1 ; \ | ||
| 251 | - done | ||
| 252 | - | ||
| 253 | install-doc: $(DOCS) | 255 | install-doc: $(DOCS) |
| 254 | $(INSTALL_DIR) "$(DESTDIR)$(docdir)" | 256 | $(INSTALL_DIR) "$(DESTDIR)$(docdir)" |
| 255 | $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" | 257 | $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" |
configure
| @@ -1743,7 +1743,7 @@ echo "TOOLS=$tools" >> $config_host_mak | @@ -1743,7 +1743,7 @@ echo "TOOLS=$tools" >> $config_host_mak | ||
| 1743 | roms= | 1743 | roms= |
| 1744 | if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ | 1744 | if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ |
| 1745 | "$targetos" != "Darwin" ; then | 1745 | "$targetos" != "Darwin" ; then |
| 1746 | - roms="pc-bios/optionrom" | 1746 | + roms="optionrom" |
| 1747 | fi | 1747 | fi |
| 1748 | echo "ROMS=$roms" >> $config_host_mak | 1748 | echo "ROMS=$roms" >> $config_host_mak |
| 1749 | 1749 |