contrib/plugins: remove Makefile for contrib/plugins
Now replaced by meson build. Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Message-Id: <20241023212812.1376972-4-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Pierrick Bouvier
Alex Bennée
parent
2181b92887
commit
55c84a72ab
10
Makefile
10
Makefile
@ -187,11 +187,6 @@ SUBDIR_RULES=$(foreach t, all clean distclean, $(addsuffix /$(t), $(SUBDIRS)))
|
|||||||
$(SUBDIR_RULES):
|
$(SUBDIR_RULES):
|
||||||
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)
|
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)
|
||||||
|
|
||||||
ifneq ($(filter contrib/plugins, $(SUBDIRS)),)
|
|
||||||
.PHONY: plugins
|
|
||||||
plugins: contrib/plugins/all
|
|
||||||
endif
|
|
||||||
|
|
||||||
.PHONY: recurse-all recurse-clean
|
.PHONY: recurse-all recurse-clean
|
||||||
recurse-all: $(addsuffix /all, $(SUBDIRS))
|
recurse-all: $(addsuffix /all, $(SUBDIRS))
|
||||||
recurse-clean: $(addsuffix /clean, $(SUBDIRS))
|
recurse-clean: $(addsuffix /clean, $(SUBDIRS))
|
||||||
@ -307,11 +302,6 @@ help:
|
|||||||
$(call print-help,cscope,Generate cscope index)
|
$(call print-help,cscope,Generate cscope index)
|
||||||
$(call print-help,sparse,Run sparse on the QEMU source)
|
$(call print-help,sparse,Run sparse on the QEMU source)
|
||||||
@echo ''
|
@echo ''
|
||||||
ifneq ($(filter contrib/plugins, $(SUBDIRS)),)
|
|
||||||
@echo 'Plugin targets:'
|
|
||||||
$(call print-help,plugins,Build the example TCG plugins)
|
|
||||||
@echo ''
|
|
||||||
endif
|
|
||||||
@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)
|
||||||
|
|||||||
18
configure
vendored
18
configure
vendored
@ -1077,7 +1077,6 @@ if test "$plugins" != "no" && test $host_bits -eq 64; then
|
|||||||
plugins="no"
|
plugins="no"
|
||||||
else
|
else
|
||||||
plugins=yes
|
plugins=yes
|
||||||
subdirs="$subdirs contrib/plugins"
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -1708,7 +1707,6 @@ LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
|
|||||||
LINKS="$LINKS tests/avocado tests/data"
|
LINKS="$LINKS tests/avocado tests/data"
|
||||||
LINKS="$LINKS tests/qemu-iotests/check tests/qemu-iotests/Makefile"
|
LINKS="$LINKS tests/qemu-iotests/check tests/qemu-iotests/Makefile"
|
||||||
LINKS="$LINKS python"
|
LINKS="$LINKS python"
|
||||||
LINKS="$LINKS contrib/plugins/Makefile "
|
|
||||||
for f in $LINKS ; do
|
for f in $LINKS ; do
|
||||||
if [ -e "$source_path/$f" ]; then
|
if [ -e "$source_path/$f" ]; then
|
||||||
symlink "$source_path/$f" "$f"
|
symlink "$source_path/$f" "$f"
|
||||||
@ -1794,22 +1792,6 @@ if test "$default_targets" = "yes"; then
|
|||||||
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
|
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# contrib/plugins configuration
|
|
||||||
echo "# Automatically generated by configure - do not modify" > contrib/plugins/$config_host_mak
|
|
||||||
echo "SRC_PATH=$source_path/contrib/plugins" >> contrib/plugins/$config_host_mak
|
|
||||||
echo "PKG_CONFIG=${pkg_config}" >> contrib/plugins/$config_host_mak
|
|
||||||
echo "CC=$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak
|
|
||||||
echo "CFLAGS=${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins/$config_host_mak
|
|
||||||
if test "$host_os" = windows; then
|
|
||||||
echo "DLLTOOL=$dlltool" >> contrib/plugins/$config_host_mak
|
|
||||||
fi
|
|
||||||
if test "$host_os" = darwin; then
|
|
||||||
echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak
|
|
||||||
fi
|
|
||||||
if test "$host_os" = windows; then
|
|
||||||
echo "CONFIG_WIN32=y" >> contrib/plugins/$config_host_mak
|
|
||||||
fi
|
|
||||||
|
|
||||||
# tests/tcg configuration
|
# tests/tcg configuration
|
||||||
mkdir -p tests/tcg
|
mkdir -p tests/tcg
|
||||||
echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak
|
echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak
|
||||||
|
|||||||
@ -1,87 +0,0 @@
|
|||||||
# -*- Mode: makefile -*-
|
|
||||||
#
|
|
||||||
# This Makefile example is fairly independent from the main makefile
|
|
||||||
# so users can take and adapt it for their build. We only really
|
|
||||||
# include config-host.mak so we don't have to repeat probing for
|
|
||||||
# programs that the main configure has already done for us.
|
|
||||||
#
|
|
||||||
|
|
||||||
include config-host.mak
|
|
||||||
|
|
||||||
TOP_SRC_PATH = $(SRC_PATH)/../..
|
|
||||||
|
|
||||||
VPATH += $(SRC_PATH)
|
|
||||||
|
|
||||||
NAMES :=
|
|
||||||
NAMES += bbv
|
|
||||||
NAMES += execlog
|
|
||||||
NAMES += hotblocks
|
|
||||||
NAMES += hotpages
|
|
||||||
NAMES += howvec
|
|
||||||
|
|
||||||
# The lockstep example communicates using unix sockets,
|
|
||||||
# and can't be easily made to work on windows.
|
|
||||||
ifneq ($(CONFIG_WIN32),y)
|
|
||||||
NAMES += lockstep
|
|
||||||
endif
|
|
||||||
|
|
||||||
NAMES += hwprofile
|
|
||||||
NAMES += cache
|
|
||||||
NAMES += drcov
|
|
||||||
NAMES += ips
|
|
||||||
NAMES += stoptrigger
|
|
||||||
NAMES += cflow
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_WIN32),y)
|
|
||||||
SO_SUFFIX := .dll
|
|
||||||
LDLIBS += $(shell $(PKG_CONFIG) --libs glib-2.0)
|
|
||||||
else
|
|
||||||
SO_SUFFIX := .so
|
|
||||||
endif
|
|
||||||
|
|
||||||
SONAMES := $(addsuffix $(SO_SUFFIX),$(addprefix lib,$(NAMES)))
|
|
||||||
|
|
||||||
# The main QEMU uses Glib extensively so it is perfectly fine to use it
|
|
||||||
# in plugins (which many example do).
|
|
||||||
PLUGIN_CFLAGS := $(shell $(PKG_CONFIG) --cflags glib-2.0)
|
|
||||||
PLUGIN_CFLAGS += -fPIC -Wall
|
|
||||||
PLUGIN_CFLAGS += -I$(TOP_SRC_PATH)/include/qemu
|
|
||||||
|
|
||||||
# Helper that honours V=1 so we get some output when compiling
|
|
||||||
quiet-@ = $(if $(V),,@$(if $1,printf " %-7s %s\n" "$(strip $1)" "$(strip $2)" && ))
|
|
||||||
quiet-command = $(call quiet-@,$2,$3)$1
|
|
||||||
|
|
||||||
# for including , in command strings
|
|
||||||
COMMA := ,
|
|
||||||
|
|
||||||
all: $(SONAMES)
|
|
||||||
|
|
||||||
%.o: %.c
|
|
||||||
$(call quiet-command, \
|
|
||||||
$(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $<, \
|
|
||||||
BUILD, plugin $@)
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_WIN32),y)
|
|
||||||
lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/libqemu_plugin_api.a
|
|
||||||
$(call quiet-command, \
|
|
||||||
$(CC) -shared -o $@ $^ $(LDLIBS), \
|
|
||||||
LINK, plugin $@)
|
|
||||||
else ifeq ($(CONFIG_DARWIN),y)
|
|
||||||
lib%$(SO_SUFFIX): %.o
|
|
||||||
$(call quiet-command, \
|
|
||||||
$(CC) -bundle -Wl$(COMMA)-undefined$(COMMA)dynamic_lookup -o $@ $^ $(LDLIBS), \
|
|
||||||
LINK, plugin $@)
|
|
||||||
else
|
|
||||||
lib%$(SO_SUFFIX): %.o
|
|
||||||
$(call quiet-command, \
|
|
||||||
$(CC) -shared -o $@ $^ $(LDLIBS), \
|
|
||||||
LINK, plugin $@)
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
clean distclean:
|
|
||||||
rm -f *.o *$(SO_SUFFIX) *.d
|
|
||||||
rm -Rf .libs
|
|
||||||
|
|
||||||
.PHONY: all clean
|
|
||||||
.SECONDARY:
|
|
||||||
Loading…
Reference in New Issue
Block a user