Skip to content

Commit f205b20

Browse files
committed
contrib/plugins: remove Makefile for contrib/plugins
Now replaced by meson build. Signed-off-by: Pierrick Bouvier <[email protected]>
1 parent 8ab117e commit f205b20

File tree

3 files changed

+0
-115
lines changed

3 files changed

+0
-115
lines changed

Makefile

-10
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,6 @@ SUBDIR_RULES=$(foreach t, all clean distclean, $(addsuffix /$(t), $(SUBDIRS)))
187187
$(SUBDIR_RULES):
188188
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),)
189189

190-
ifneq ($(filter contrib/plugins, $(SUBDIRS)),)
191-
.PHONY: plugins
192-
plugins: contrib/plugins/all
193-
endif
194-
195190
.PHONY: recurse-all recurse-clean
196191
recurse-all: $(addsuffix /all, $(SUBDIRS))
197192
recurse-clean: $(addsuffix /clean, $(SUBDIRS))
@@ -307,11 +302,6 @@ help:
307302
$(call print-help,cscope,Generate cscope index)
308303
$(call print-help,sparse,Run sparse on the QEMU source)
309304
@echo ''
310-
ifneq ($(filter contrib/plugins, $(SUBDIRS)),)
311-
@echo 'Plugin targets:'
312-
$(call print-help,plugins,Build the example TCG plugins)
313-
@echo ''
314-
endif
315305
@echo 'Cleaning targets:'
316306
$(call print-help,clean,Remove most generated files but keep the config)
317307
$(call print-help,distclean,Remove all generated files)

configure

-18
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,6 @@ if test "$plugins" != "no" && test $host_bits -eq 64; then
10731073
plugins="no"
10741074
else
10751075
plugins=yes
1076-
subdirs="$subdirs contrib/plugins"
10771076
fi
10781077
fi
10791078

@@ -1699,7 +1698,6 @@ LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
16991698
LINKS="$LINKS tests/avocado tests/data"
17001699
LINKS="$LINKS tests/qemu-iotests/check tests/qemu-iotests/Makefile"
17011700
LINKS="$LINKS python"
1702-
LINKS="$LINKS contrib/plugins/Makefile "
17031701
for f in $LINKS ; do
17041702
if [ -e "$source_path/$f" ]; then
17051703
symlink "$source_path/$f" "$f"
@@ -1785,22 +1783,6 @@ if test "$default_targets" = "yes"; then
17851783
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
17861784
fi
17871785

1788-
# contrib/plugins configuration
1789-
echo "# Automatically generated by configure - do not modify" > contrib/plugins/$config_host_mak
1790-
echo "SRC_PATH=$source_path/contrib/plugins" >> contrib/plugins/$config_host_mak
1791-
echo "PKG_CONFIG=${pkg_config}" >> contrib/plugins/$config_host_mak
1792-
echo "CC=$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak
1793-
echo "CFLAGS=${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins/$config_host_mak
1794-
if test "$host_os" = windows; then
1795-
echo "DLLTOOL=$dlltool" >> contrib/plugins/$config_host_mak
1796-
fi
1797-
if test "$host_os" = darwin; then
1798-
echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak
1799-
fi
1800-
if test "$host_os" = windows; then
1801-
echo "CONFIG_WIN32=y" >> contrib/plugins/$config_host_mak
1802-
fi
1803-
18041786
# tests/tcg configuration
18051787
mkdir -p tests/tcg
18061788
echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak

contrib/plugins/Makefile

-87
This file was deleted.

0 commit comments

Comments
 (0)