[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 122/142] remove Makefile.target
From: |
Paolo Bonzini |
Subject: |
[PATCH 122/142] remove Makefile.target |
Date: |
Tue, 28 Jan 2020 18:53:22 +0100 |
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 52 ++++---------------------------------------------
Makefile.objs | 27 -------------------------
Makefile.target | 13 -------------
configure | 2 --
4 files changed, 4 insertions(+), 90 deletions(-)
delete mode 100644 Makefile.target
diff --git a/Makefile b/Makefile
index ddcd39fad5..898aa81232 100644
--- a/Makefile
+++ b/Makefile
@@ -154,24 +154,10 @@ ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/Makefile.objs
endif
-dummy := $(call unnest-vars,, common-obj-y)
-
include $(SRC_PATH)/tests/Makefile.include
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))
-SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES))
-
-SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES))
-
-.PHONY: $(TARGET_DIRS_RULES)
-# The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that
-# $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal
-$(TARGET_DIRS_RULES): $(TARGET_DEPS)
- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)"
TARGET_DIR="$(dir $@)" $(notdir $@),)
-
DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)"
LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
@@ -213,8 +199,6 @@ subdir-dtc: dtc/all
subdir-capstone: capstone/all
subdir-slirp: slirp/all
-$(filter %/all, $(TARGET_DIRS_RULES)):
-
ROM_DIRS = $(addprefix pc-bios/, $(ROMS))
ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS)))
# Only keep -O and -g cflags
@@ -222,11 +206,9 @@ ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t),
$(ROM_DIRS)))
$(ROM_DIRS_RULES):
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)"
TARGET_DIR="$(dir $@)" CFLAGS="$(filter -O% -g%,$(CFLAGS))" $(notdir $@),)
-.PHONY: recurse-all recurse-clean recurse-install
-recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
-recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
-recurse-install: $(addsuffix /install, $(TARGET_DIRS))
-$(addsuffix /install, $(TARGET_DIRS)): all
+.PHONY: recurse-all recurse-clean
+recurse-all: $(ROM_DIRS)
+recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
######################################################################
@@ -279,9 +261,6 @@ distclean: clean
$(call clean-manual,devel)
$(call clean-manual,interop)
$(call clean-manual,specs)
- for d in $(TARGET_DIRS); do \
- rm -rf $$d || exit 1 ; \
- done
rm -Rf .sdk
if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi
@@ -383,8 +362,7 @@ 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
+ $(if $(INSTALL_BLOBS),$(edk2-decompressed))
ifdef CONFIG_TRACE_SYSTEMTAP
$(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir)
endif
@@ -429,9 +407,6 @@ endif
set -e; for x in $(KEYMAPS); do \
$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x
"$(DESTDIR)$(qemu_datadir)/keymaps"; \
done
- for d in $(TARGET_DIRS); do \
- $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \
- done
# documentation
MAKEINFO=makeinfo
@@ -526,20 +501,6 @@ docs/interop/qemu-qmp-ref.dvi
docs/interop/qemu-qmp-ref.html \
$(filter %.1 %.7 %.8,$(DOCS)): scripts/texi2pod.pl
-# Reports/Analysis
-
-%/coverage-report.html:
- @mkdir -p $*
- $(call quiet-command,\
- gcovr -r $(SRC_PATH) \
- $(foreach t, $(TARGET_DIRS), --object-directory
$(BUILD_DIR)/$(t)) \
- --object-directory $(BUILD_DIR) \
- -p --html --html-details -o $@, \
- "GEN", "coverage-report.html")
-
-.PHONY: coverage-report
-coverage-report: $(CURDIR)/reports/coverage/coverage-report.html
-
ifdef CONFIG_WIN32
INSTALLER = qemu-setup-$(VERSION)$(EXESUF)
@@ -623,11 +584,6 @@ endif
@echo ' ctags/TAGS - Generate tags file for editors'
@echo ' cscope - Generate cscope index'
@echo ''
- @$(if $(TARGET_DIRS), \
- echo 'Architecture specific targets:'; \
- $(foreach t, $(TARGET_DIRS), \
- printf " %-30s - Build for %s\\n" $(t)/all $(t);) \
- echo '')
@echo 'Cleaning targets:'
@echo ' clean - Remove most generated files but keep the
config'
@echo ' distclean - Remove all generated files'
diff --git a/Makefile.objs b/Makefile.objs
index 9fd3932ae0..654667f501 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -28,30 +28,3 @@ crypto-obj-y = crypto/libcrypto.fa
io-obj-y = io/libio.fa
qom-obj-y = qom/libqom.fa
-
-######################################################################
-# Target independent part of system emulation. The long term path is to
-# suppress *all* target specific code in case of system emulation, i.e. a
-# single QEMU executable should support all CPUs and machines.
-
-ifeq ($(CONFIG_SOFTMMU),y)
-common-obj-$(CONFIG_AUDIO_ALSA) += audio-alsa$(DSOSUF)
-common-obj-$(CONFIG_AUDIO_OSS) += audio-oss$(DSOSUF)
-common-obj-$(CONFIG_AUDIO_PA) += audio-pa$(DSOSUF)
-common-obj-$(CONFIG_AUDIO_SDL) += audio-sdl$(DSOSUF)
-
-common-obj-$(if $(CONFIG_CURSES),m) += ui-curses$(DSOSUF)
-common-obj-$(if $(CONFIG_GTK),m) += ui-gtk$(DSOSUF)
-common-obj-$(if $(CONFIG_SDL),m) += ui-sdl$(DSOSUF)
-common-obj-$(if $(CONFIG_SPICE),m) += ui-spice-app$(DSOSUF)
-
-common-obj-$(if $(CONFIG_CURL),m) += block-curl$(DSOSUF)
-common-obj-$(if $(CONFIG_GLUSTERFS),m) += block-gluster$(DSOSUF)
-common-obj-$(if $(CONFIG_LIBISCSI),m) += block-iscsi$(DSOSUF)
-common-obj-$(if $(CONFIG_LIBNFS),m) += block-nfs$(DSOSUF)
-common-obj-$(if $(CONFIG_LIBSSH),m) += block-ssh$(DSOSUF)
-common-obj-$(if $(CONFIG_RBD),m) += block-rbd$(DSOSUF)
-
-common-obj-$(if $(CONFIG_LZFSE),m) += block-dmg-lzfse$(DSOSUF)
-common-obj-$(if $(and $(CONFIG_BZIP2),$(CONFIG_DMG)),m) +=
block-dmg-bz2$(DSOSUF)
-endif
diff --git a/Makefile.target b/Makefile.target
deleted file mode 100644
index 4f72a8950d..0000000000
--- a/Makefile.target
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: makefile -*-
-
-BUILD_DIR?=$(CURDIR)/..
-
-include ../config-host.mak
-include config-target.mak
-include $(SRC_PATH)/rules.mak
-
-all:
-clean:
-install: all
-
-.PHONY: all clean install
diff --git a/configure b/configure
index e39d7ac2d1..089bff7c37 100755
--- a/configure
+++ b/configure
@@ -7796,8 +7796,6 @@ if [ "$TARGET_BASE_ARCH" = "" ]; then
TARGET_BASE_ARCH=$TARGET_ARCH
fi
-symlink "$source_path/Makefile.target" "$target_dir/Makefile"
-
upper() {
echo "$@"| LC_ALL=C tr '[a-z]' '[A-Z]'
}
--
2.21.0
- [PATCH 112/142] meson: target, (continued)
- [PATCH 112/142] meson: target, Paolo Bonzini, 2020/01/28
- [PATCH 116/142] meson: cpu-emu, Paolo Bonzini, 2020/01/28
- [PATCH 117/142] meson: softmmu, Paolo Bonzini, 2020/01/28
- [PATCH 118/142] meson: plugins, Paolo Bonzini, 2020/01/28
- [PATCH 120/142] meson: generate systemtap tapset files, Paolo Bonzini, 2020/01/28
- [PATCH 121/142] build-sys/rules.mak: remove version.o, Paolo Bonzini, 2020/01/28
- [PATCH 119/142] Aaaaallelujah!, Paolo Bonzini, 2020/01/28
- [PATCH 122/142] remove Makefile.target,
Paolo Bonzini <=
- [PATCH 123/142] meson: sphinx-build, Paolo Bonzini, 2020/01/28
- [PATCH 124/142] meson: generate version.texi, Paolo Bonzini, 2020/01/28
- [PATCH 126/142] meson: add NSIS building, Paolo Bonzini, 2020/01/28
- [PATCH 125/142] meson: build texi doc, Paolo Bonzini, 2020/01/28
- [PATCH 127/142] meson: install some scripts, Paolo Bonzini, 2020/01/28
- [PATCH 128/142] meson: install edk2, Paolo Bonzini, 2020/01/28
- [PATCH 130/142] meson: install edk2 json descriptors, Paolo Bonzini, 2020/01/28
- [PATCH 129/142] meson: install blobs, Paolo Bonzini, 2020/01/28
- [PATCH 132/142] meson: install desktop file, Paolo Bonzini, 2020/01/28
- [PATCH 131/142] meson: install icons, Paolo Bonzini, 2020/01/28