xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 05:20:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure, Makefile; remove TOOLS and HELPERS-y variable

Browse Source 
Everything involving tools is now done by meson.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-07-18 13:21:28 +02:00
parent 897b5afae5
commit c3a0ee847a
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -138,8 +138,6 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS) LIBS+=-lz $(LIBS_TOOLS)
HELPERS-y =
# Sphinx does not allow building manuals into the same directory as # Sphinx does not allow building manuals into the same directory as
# the source files, so if we're doing an in-tree QEMU build we must # the source files, so if we're doing an in-tree QEMU build we must
# build the manuals into a subdirectory (and then install them from # build the manuals into a subdirectory (and then install them from
@ -188,7 +186,7 @@ dummy := $(call unnest-vars,, \
include $(SRC_PATH)/tests/Makefile.include include $(SRC_PATH)/tests/Makefile.include
all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) $(TOOLS) $(HELPERS-y) recurse-all modules all: $(DOCS) $(if $(BUILD_DOCS),sphinxdocs) recurse-all modules
config-host.h: config-host.h-timestamp config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak config-host.h-timestamp: config-host.mak
@ -300,7 +298,7 @@ clean: recurse-clean ninja-clean clean-ctlist
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \ ! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll \
-exec rm {} + -exec rm {} +
rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~ */*~ rm -f TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod rm -f fsdev/*.pod scsi/*.pod
rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp) rm -f $(foreach f,$(generated-files-y),$(f) $(f)-timestamp)
@ -452,12 +450,6 @@ export DESTDIR
install: all $(if $(BUILD_DOCS),install-doc) \ install: all $(if $(BUILD_DOCS),install-doc) \
install-datadir install-localstatedir install-includedir \ install-datadir install-localstatedir install-includedir \
recurse-install recurse-install
ifneq ($(TOOLS),)
$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
endif
ifneq ($(HELPERS-y),)
$(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
endif
ifdef CONFIG_TRACE_SYSTEMTAP ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
endif endif
@ -717,16 +709,6 @@ endif
$(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \ $(call print-help-run,$(t)/fuzz,Build fuzzer for $(t)); \
))) \ ))) \
echo '') echo '')
@$(if $(HELPERS-y), \
echo 'Helper targets:'; \
$(foreach t, $(HELPERS-y), \
$(call print-help-run,$(t),Build $(shell basename $(t)));) \
echo '')
@$(if $(TOOLS), \
echo 'Tools targets:'; \
$(foreach t, $(TOOLS), \
$(call print-help-run,$(t),Build $(shell basename $(t)) tool);) \
echo '')
@echo 'Cleaning targets:' @echo 'Cleaning targets:'
$(call print-help,clean,Remove most generated files but keep the config) $(call print-help,clean,Remove most generated files but keep the config)
$(call print-help,distclean,Remove all generated files) $(call print-help,distclean,Remove all generated files)

7
configure vendored
View File

@ -6716,12 +6716,6 @@ if [ "$eventfd" = "yes" ]; then
ivshmem=yes ivshmem=yes
fi fi
tools=""
if test "$want_tools" = "yes" ; then
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
tools="qemu-storage-daemon\$(EXESUF) $tools"
fi
fi
if test "$softmmu" = yes ; then if test "$softmmu" = yes ; then
if test "$linux" = yes; then if test "$linux" = yes; then
if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
@ -7817,7 +7811,6 @@ else
QEMU_INCLUDES="-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES" QEMU_INCLUDES="-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES"
fi fi
echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak
echo "INSTALL=$install" >> $config_host_mak echo "INSTALL=$install" >> $config_host_mak