Commit df2943ba authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

qemu-options.def: add to generated header list 



All files include qemu-options.h which pulls in qemu-options.def from
the root directory.  Thus generating qemu-options.def from Makefile.objs
under the target directory is not effective.

Further, people expect .def file to get cleaned with make clean:
it does not have state so no reason to defer removing it
until distclean. Also add a rule to remove old files that might
be around.

This fixes the error: ‘QEMU_OPTION_spice’ undeclared
(first use in this function) error that some people reported
which is really down to an out of date .def file.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f7c31d63

Makefile

+5 −2
Original line number Diff line number Diff line 
# Makefile for QEMU.



GENERATED_HEADERS = config-host.h trace.h

GENERATED_HEADERS = config-host.h trace.h qemu-options.def



ifneq ($(wildcard config-host.mak),)

# Put the all: rule here so that config-host.mak can contain dependencies.
@@ -71,6 +71,8 @@ build-all: $(DOCS) $(TOOLS) recurse-all 


config-host.h: config-host.h-timestamp

config-host.h-timestamp: config-host.mak

qemu-options.def: qemu-options.hx

	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")



SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
@@ -150,6 +152,7 @@ check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjs 
clean:

# avoid old build problems by removing potentially incorrect old files

	rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h

	rm -f qemu-options.def

	rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~

	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d

	rm -f qemu-img-cmds.h
@@ -157,11 +160,11 @@ clean: 
	$(MAKE) -C tests clean

	for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \

	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \

	rm -f $$d/qemu-options.def; \

        done



distclean: clean

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi

	rm -f qemu-options.def

	rm -f config-all-devices.mak

	rm -f roms/seabios/config.mak roms/vgabios/config.mak

	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.dvi qemu-doc.fn qemu-doc.info qemu-doc.ky qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp qemu-doc.vr

Makefile.objs

+0 −7
Original line number Diff line number Diff line
@@ -285,10 +285,3 @@ vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) 


vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)

vl.o: qemu-options.def

os-posix.o: qemu-options.def

os-win32.o: qemu-options.def



qemu-options.def: $(SRC_PATH)/qemu-options.hx

	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")