mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Option rom makefile fixes

Browse Source 
Fix toplevel option rom makefile rules.

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2009-07-31 13:18:32 +01:00
parent ffe47d331d
commit c05ac895cb
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -38,7 +38,7 @@ ifdef CONFIG_WIN32
LIBS+=-lwinmm -lws2_32 -liphlpapi LIBS+=-lwinmm -lws2_32 -liphlpapi
endif endif
build-all: $(TOOLS) $(DOCS) roms recurse-all build-all: $(TOOLS) $(DOCS) recurse-all
config-host.mak: configure config-host.mak: configure
ifneq ($(wildcard config-host.mak),) ifneq ($(wildcard config-host.mak),)
@ -55,7 +55,14 @@ subdir-%:
$(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
$(filter %-user,$(SUBDIR_RULES)): libqemu_user.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 # 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 slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
rm -f qemu-img-cmds.h rm -f qemu-img-cmds.h
$(MAKE) -C tests clean $(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 ; \ $(MAKE) -C $$d $@ || exit 1 ; \
done done
@ -245,11 +252,6 @@ else
BLOBS= BLOBS=
endif endif
roms:
for d in $(ROMS); do \
$(MAKE) -C $$d || exit 1 ; \
done
install-doc: $(DOCS) install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(docdir)" $(INSTALL_DIR) "$(DESTDIR)$(docdir)"
$(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"

2
configure vendored
View File

@ -1743,7 +1743,7 @@ echo "TOOLS=$tools" >> $config_host_mak
roms= roms=
if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
"$targetos" != "Darwin" ; then "$targetos" != "Darwin" ; then
roms="pc-bios/optionrom" roms="optionrom"
fi fi
echo "ROMS=$roms" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak

2
pc-bios/optionrom/Makefile
View File

@ -1,4 +1,6 @@
all: build-all all: build-all
# Dummy command so that make thinks it has done something
@true
include ../../config-host.mak include ../../config-host.mak
include $(SRC_PATH)/rules.mak include $(SRC_PATH)/rules.mak