From 31e79905f894f5d7d38a79dc42707799382db18b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 21 Apr 2020 01:44:31 +0200
Subject: [PATCH] Clean more old paths

---
 Makefile.host                 | 5 +++++
 client/deps/amiitool/Makefile | 3 +++
 client/deps/jansson/Makefile  | 3 +++
 client/deps/liblua/Makefile   | 3 +++
 client/deps/reveng/Makefile   | 3 +++
 client/deps/tinycbor/Makefile | 3 +++
 6 files changed, 20 insertions(+)

diff --git a/Makefile.host b/Makefile.host
index 896c9b361..02581ee45 100644
--- a/Makefile.host
+++ b/Makefile.host
@@ -36,6 +36,11 @@ all: $(foreach bin,$(MYLIBS) $(BINS) $(LIB_A),$(BINDIR)/$(bin))
 clean:
 	$(Q)$(RM) $(CLEAN)
 	$(Q)$(RMDIR) $(OBJDIR)
+ifneq (,$(MYCLEANOLDPATH))
+	    $(Q)$(RM) $(foreach f,$(CLEAN),$(MYCLEANOLDPATH)/$(f))
+	    $(Q)$(RMDIR) $(MYCLEANOLDPATH)/$(OBJDIR)
+	    $(Q)$(RMDIR_SOFT) $(MYCLEANOLDPATH)
+endif
 
 install: all
 ifneq (,$(INSTALLTOOLS))
diff --git a/client/deps/amiitool/Makefile b/client/deps/amiitool/Makefile
index 6926c12c6..ff2c0da88 100644
--- a/client/deps/amiitool/Makefile
+++ b/client/deps/amiitool/Makefile
@@ -9,6 +9,9 @@ MYSRCS = \
 
 LIB_A = libamiibo.a
 
+# Transition: remove old directories and objects
+MYCLEANOLDPATH = ../../amiitool
+
 include ../../../Makefile.host
 
 # just for testing amiitool before complete migration into a lib:
diff --git a/client/deps/jansson/Makefile b/client/deps/jansson/Makefile
index 1ef283bab..111aed087 100644
--- a/client/deps/jansson/Makefile
+++ b/client/deps/jansson/Makefile
@@ -18,4 +18,7 @@ MYSRCS = \
 
 LIB_A = libjansson.a
 
+# Transition: remove old directories and objects
+MYCLEANOLDPATH = ../../jansson
+
 include ../../../Makefile.host
diff --git a/client/deps/liblua/Makefile b/client/deps/liblua/Makefile
index d4b31be0a..692684186 100644
--- a/client/deps/liblua/Makefile
+++ b/client/deps/liblua/Makefile
@@ -14,6 +14,9 @@ SYSCFLAGS=
 
 LIB_A= liblua.a
 
+# Transition: remove old directories and objects
+MYCLEANOLDPATH = ../../liblua
+
 # Your platform. See PLATS for possible values.
 PLAT= none
 
diff --git a/client/deps/reveng/Makefile b/client/deps/reveng/Makefile
index cca536c02..93c363d70 100644
--- a/client/deps/reveng/Makefile
+++ b/client/deps/reveng/Makefile
@@ -17,6 +17,9 @@ MYSRCS = \
 
 LIB_A = libreveng.a
 
+# Transition: remove old directories and objects
+MYCLEANOLDPATH = ../../reveng
+
 include ../../../Makefile.host
 
 CLEAN += bmptst
diff --git a/client/deps/tinycbor/Makefile b/client/deps/tinycbor/Makefile
index 376e2b641..713b6e428 100644
--- a/client/deps/tinycbor/Makefile
+++ b/client/deps/tinycbor/Makefile
@@ -16,6 +16,9 @@ MYSRCS = \
 
 LIB_A = tinycbor.a
 
+# Transition: remove old directories and objects
+MYCLEANOLDPATH = ../../tinycbor
+
 # Strange errors on Mingw when compiling with -O3
 CFLAGS ?= -Wall -Werror -O2