Skip to content

Commit 6e6761d

Browse files
pm215huth
authored andcommitted
Makefile: allow 'make uninstall'
Meson supports an "uninstall", so we can easily allow it to work by not suppressing the forwarding of it from Make to meson. We originally suppressed this because Meson's 'uninstall' has a hole in it: it will remove everything that is installed by a mechanism meson knows about, but not things installed by "custom install scripts", and there is no "custom uninstall script" mechanism. For QEMU, though, the only thing that was being installed by a custom install script was the LC_MESSAGES files handled by Meson's i18n module, and that code was fixed in Meson commit 487d45c1e5bfff0fbdb4, which is present in Meson 0.60.0 and later. Since we already require a Meson version newer than that, we're now safe to enable 'uninstall', as it will now correctly uninstall everything that was installed. Signed-off-by: Peter Maydell <[email protected]> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/109 Message-Id: <[email protected]> Signed-off-by: Thomas Huth <[email protected]>
1 parent 5e988b9 commit 6e6761d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
150150
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
151151
ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))
152152

153-
makefile-targets := build.ninja ctags TAGS cscope dist clean uninstall
153+
makefile-targets := build.ninja ctags TAGS cscope dist clean
154154
# "ninja -t targets" also lists all prerequisites. If build system
155155
# files are marked as PHONY, however, Make will always try to execute
156156
# "ninja build.ninja".

0 commit comments

Comments
 (0)