diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-07-31 13:18:32 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 21:23:36 -0500 |
| commit | ad19cf307ea18a54405e88f48ae8ae8c3e400679 (patch) | |
| tree | d305d32721e9920f54728acc30d179e1241f4820 | |
| parent | 477806703a43558108cd1efbfb59a67c1d24e074 (diff) | |
| download | qemu-ad19cf307ea18a54405e88f48ae8ae8c3e400679.tar.gz | |
Option rom makefile fixes
Fix toplevel option rom makefile rules.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile | 18 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | pc-bios/optionrom/Makefile | 2 |
3 files changed, 15 insertions, 10 deletions
@@ -40,7 +40,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),) @@ -57,7 +57,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 @@ -235,7 +242,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 @@ -260,11 +267,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)" @@ -1807,8 +1807,9 @@ fi echo "TOOLS=$tools" >> $config_host_mak roms= -if test "$cpu" = "i386" -o "$cpu" = "x86_64" ; then - roms="pc-bios/optionrom" +if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ + "$targetos" != "Darwin" ; then + roms="optionrom" fi echo "ROMS=$roms" >> $config_host_mak diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 88fbc4c9b3..e7ad4b198a 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -1,4 +1,6 @@ all: build-all +# Dummy command so that make thinks it has done something + @true include ../../config-host.mak |