[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable
From: |
Paolo Bonzini |
Subject: |
[PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable |
Date: |
Thu, 12 Dec 2019 13:51:29 +0100 |
Everything involving tools is now done by meson.
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 12 ++----------
configure | 2 --
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 0cbdc34..c4cfca9 100644
--- a/Makefile
+++ b/Makefile
@@ -113,8 +113,6 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
-HELPERS-y =
-
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt
docs/interop/qemu-qmp-ref.7
@@ -143,7 +141,7 @@ dummy := $(call unnest-vars,, \
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
TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t),
$(TARGET_DIRS)))
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
@@ -246,7 +244,7 @@ clean: recurse-clean
! -path ./roms/edk2/BaseTools/Source/Python/UPT/Dll/sqlite3.dll
\
-exec rm {} +
rm -f $(edk2-decompressed)
- rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) TAGS cscope.* *.pod *~
*/*~
+ rm -f TAGS cscope.* *.pod *~ */*~
rm -f fsdev/*.pod scsi/*.pod
rm -f qemu-img-cmds.h
rm -f ui/shader/*-vert.h ui/shader/*-frag.h
@@ -407,12 +405,6 @@ ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256
512x512
install: all $(if $(BUILD_DOCS),install-doc) install-datadir
install-localstatedir \
$(if $(INSTALL_BLOBS),$(edk2-decompressed)) \
recurse-install
-ifneq ($(TOOLS),)
- $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
-endif
-ifneq ($(HELPERS-y),)
- $(call install-prog,$(HELPERS-y),$(DESTDIR)$(libexecdir))
-endif
ifneq ($(vhost-user-json-y),)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/vhost-user/"
for x in $(vhost-user-json-y); do \
diff --git a/configure b/configure
index 4757e45..658b062 100755
--- a/configure
+++ b/configure
@@ -6042,7 +6042,6 @@ if [ "$eventfd" = "yes" ]; then
ivshmem=yes
fi
-tools=""
if test "$softmmu" = yes ; then
if test "$linux" = yes; then
if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ;
then
@@ -7271,7 +7270,6 @@ else
fi
QEMU_INCLUDES="-iquote ${source_path}/tcg $QEMU_INCLUDES"
-echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "INSTALL=$install" >> $config_host_mak
--
1.8.3.1
- [PATCH 034/132] meson: convert qom directory to Meson, (continued)
- [PATCH 034/132] meson: convert qom directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 036/132] meson: convert crypto directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 037/132] meson: convert io directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 039/132] meson: add macos dependencies, Paolo Bonzini, 2019/12/12
- [PATCH 038/132] meson: infrastructure for building emulators, Paolo Bonzini, 2019/12/12
- [PATCH 041/132] meson: convert chardev directory to Meson (tools part), Paolo Bonzini, 2019/12/12
- [PATCH 043/132] meson: qemu-{img,io,nbd}, Paolo Bonzini, 2019/12/12
- [PATCH 042/132] meson: convert block, Paolo Bonzini, 2019/12/12
- [PATCH 044/132] meson: qemu-pr-helper, Paolo Bonzini, 2019/12/12
- [PATCH 040/132] meson: add modules infrastructure, Paolo Bonzini, 2019/12/12
- [PATCH 045/132] configure, Makefile; remove TOOLS and HELPERS-y variable,
Paolo Bonzini <=
- [PATCH 046/132] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2019/12/12
- [PATCH 047/132] meson: convert audio directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 049/132] meson: convert root directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 048/132] meson: convert ui directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 051/132] meson: convert qom/, Paolo Bonzini, 2019/12/12
- [PATCH 050/132] meson: convert trace/, Paolo Bonzini, 2019/12/12
- [PATCH 052/132] meson: convert block/, Paolo Bonzini, 2019/12/12
- [PATCH 053/132] meson: convert dump/, Paolo Bonzini, 2019/12/12
- [PATCH 054/132] meson: convert monitor directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 055/132] meson: convert replay directory to Meson, Paolo Bonzini, 2019/12/12