[PATCH 115/132] remove Makefile.target

[Paolo Bonzini]

Signed-off-by: Marc-André Lureau <address@hidden>

Signed-off-by: Paolo Bonzini <address@hidden>
---
 Makefile        | 32 +++-----------------------------
 Makefile.objs   | 27 ---------------------------
 Makefile.target | 13 -------------
 configure       |  2 --
 meson.build     |  9 ---------
 5 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 Makefile.target

diff --git a/Makefile b/Makefile
index afb5e26..f2152ce 100644
--- a/Makefile
+++ b/Makefile
@@ -184,10 +184,9 @@ $(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
+recurse-all: $(ROM_DIRS)
+recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
+recurse-install:
 
 ######################################################################
 
@@ -265,9 +264,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
 
@@ -419,9 +415,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
 
 .PHONY: ctags
 ctags:
@@ -525,20 +518,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)
@@ -622,11 +601,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 9fd3932..654667f 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 4f72a89..0000000
--- 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 ad36082..f6e3b0a 100755
--- a/configure
+++ b/configure
@@ -7597,8 +7597,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]'
 }
diff --git a/meson.build b/meson.build
index 4fb3bdc..55ccb79 100644
--- a/meson.build
+++ b/meson.build
@@ -823,15 +823,6 @@ foreach target : target_dirs
                               command: [create_config, '@INPUT@'])
 
   target_specific = specific_ss.apply(config_target, strict: false)
-  static_library('qemu-' + target,
-                 sources: target_specific.sources() + arch_srcs + 
[config_target_h],
-                 dependencies: target_specific.dependencies() + arch_deps + 
deps,
-                 objects: objects,
-                 include_directories: target_inc,
-                 c_args: ['-DNEED_CPU_H',
-                          
'-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
-                          
'-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)],
-                 name_suffix: 'fa')
 
   execs = [{'postfix': '', 'gui': false}]
   if sdlwindows
-- 
1.8.3.1