From 2ea5ecaced05f3507e4b76d74cd17d988f1bafc8 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 1 Jan 2020 10:21:25 +1100
Subject: Backport: Be more accurate for 'make clean'.

Backport of changeset 7874:295a6e54d582.
---
 win32/makefile      | 5 ++++-
 win32/scintilla.mak | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/makefile b/win32/makefile
index 695544a8a..71be978c7 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -35,6 +35,9 @@ WINDRES ?= windres
 
 # Environment variable windir always defined on Win32
 
+# Take care of changing Unix style '/' directory separator to '\' on Windows
+normalize = $(if $(windir),$(subst /,\,$1),$1)
+
 ifdef windir
 DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
 else
@@ -69,7 +72,7 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS)
 all:	$(COMPONENT) $(LEXCOMPONENT) $(LIBSCI)
 
 clean:
-	$(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist
+	$(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist $(call normalize,$(LIBSCI))
 
 ifdef LPEG_LEXER
 CXXFLAGS+=-DLPEG_LEXER -I ../lua/src
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index dd010ac63..0692a22af 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -61,7 +61,8 @@ all:	$(COMPONENT) $(LEXCOMPONENT) $(LIBSCI)
 
 clean:
 	-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(DIR_O)\*.asm $(COMPONENT) $(LEXCOMPONENT) \
-	$(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb $(DIR_BIN)\*.lib
+	$(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb \
+	$(DIR_BIN)\Scintilla.lib $(DIR_BIN)\SciLexer.lib $(LIBSCI)
 
 depend:
 	python DepGen.py
-- 
cgit v1.2.3