From c36467c1a9cdc569bd51428a2468f4d3760546ec Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Wed, 7 Mar 2012 11:35:45 -0500 Subject: [PATCH 85/98] Rename qemu-options.h to qemu-options.def Rename qemu-options.h to qemu-options.def as it is not a header file for general use and this leaves space for a proper qemu-options.h Signed-off-by: Jes Sorensen Acked-by: Juan Quintela Acked-by: Richard Henderson Signed-off-by: Blue Swirl (cherry picked from commit 9f16732a062fc7a3ffc5909dc681f05455cfdabc) Conflicts: Makefile.objs vl.c Signed-off-by: Jeff Cody Signed-off-by: Michal Novotny --- Makefile.target | 6 +++--- vl.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index 906ea41..9a7be3c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -381,7 +381,7 @@ main.o vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) -vl.o: qemu-options.h +vl.o: qemu-options.def monitor.o: qemu-monitor.h @@ -411,7 +411,7 @@ $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") -qemu-options.h: $(SRC_PATH)/qemu-options.hx +qemu-options.def: $(SRC_PATH)/qemu-options.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") qemu-monitor.h: $(SRC_PATH)/qemu-monitor.hx @@ -420,7 +420,7 @@ qemu-monitor.h: $(SRC_PATH)/qemu-monitor.hx clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o rm -f *.d */*.d tcg/*.o ide/*.o - rm -f qemu-options.h qemu-monitor.h gdbstub-xml.c + rm -f qemu-options.def qemu-monitor.h gdbstub-xml.c ifdef CONFIG_SYSTEMTAP_TRACE rm -f *.stp endif diff --git a/vl.c b/vl.c index 856b751..c2c133c 100644 --- a/vl.c +++ b/vl.c @@ -4283,7 +4283,7 @@ static void help(int exitcode) #define DEF(option, opt_arg, opt_enum, opt_help) \ opt_help #define DEFHEADING(text) stringify(text) "\n" -#include "qemu-options.h" +#include "qemu-options.def" #undef DEF #undef DEFHEADING #undef GEN_DOCS @@ -4313,7 +4313,7 @@ enum { #define DEF(option, opt_arg, opt_enum, opt_help) \ opt_enum, #define DEFHEADING(text) -#include "qemu-options.h" +#include "qemu-options.def" #undef DEF #undef DEFHEADING #undef GEN_DOCS @@ -4330,7 +4330,7 @@ static const QEMUOption qemu_options[] = { #define DEF(option, opt_arg, opt_enum, opt_help) \ { option, opt_arg, opt_enum }, #define DEFHEADING(text) -#include "qemu-options.h" +#include "qemu-options.def" #undef DEF #undef DEFHEADING #undef GEN_DOCS -- 1.7.7.6