From 9041f14f00d5a111877caac0ae1d476f8c6034c5 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Thu, 2 Jul 2020 14:17:37 -0400 Subject: [PATCH] make: cleanup before removing loolwsd binary Change-Id: I28dbb165a716646ce5e423e28980ba41ca81d18f Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97782 Tested-by: Jenkins CollaboraOffice Reviewed-by: Ashod Nakashian --- Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 074f05376..f6dfcfb3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -349,6 +349,13 @@ $(SYSTEM_STAMP): ${top_srcdir}/loolwsd-systemplate-setup loolwsd caps_bins $(CLEANUP_COMMAND) mkdir -p $@ +cleanup: + $(CLEANUP_COMMAND) + +# Always cleanup before removing the binaries. +# Note: this can break with -j option! +clean-am: cleanup clean-binPROGRAMS clean-generic clean-libtool clean-local clean-noinstPROGRAMS mostlyclean-am + clean-local: $(CLEANUP_COMMAND) if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi @@ -473,7 +480,7 @@ endif # installing. When building for packaging, no need for this, as the # capabilities won't survive packaging anyway. Instead, handle it when # installing the RPM or Debian package. -.PHONY: caps_bins +.PHONY: caps_bins cleanup all-local: loolwsd caps_bins @JAILS_PATH@ $(SYSTEM_STAMP)