From 6009be9e63f175479df01cd64d3ef6e0724afd6c Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 1 Apr 2019 14:30:32 +1100
Subject: Backport: Switch generation of make dependencies to Python scripts
 DepGen.py. Dependencies files deps.mak and nmdeps.mak are formatted with one
 file per line as that makes it easier to examine differences between
 versions.

Backport of changeset 7397:997e6203e270.
---
 win32/makefile | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'win32/makefile')

diff --git a/win32/makefile b/win32/makefile
index b190cc4d5..1b6c36933 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -80,8 +80,8 @@ endif
 analyze:
 	$(CXX) --analyze $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx
 
-deps:
-	$(CXX) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak
+depend deps.mak:
+	python DepGen.py
 
 LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard ../lexers/Lex*.cxx)))))
 
@@ -155,31 +155,6 @@ $(LIBSCI): ScintillaWin.o $(SCILEXOBJS)
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak
 
-# These dependencies are maintained by hand as they do not use the default output name
-
-ScintillaBaseL.o: ScintillaBase.cxx Platform.h \
- ILexer.h Scintilla.h SciLexer.h PropSetSimple.h \
- SplitVector.h Partitioning.h RunStyles.h \
- ContractionState.h CellBuffer.h CallTip.h \
- KeyMap.h Indicator.h XPM.h LineMarker.h \
- Style.h ViewStyle.h AutoComplete.h \
- CharClassify.h Decoration.h Document.h \
- Selection.h PositionCache.h EditModel.h Editor.h EditView.h \
- ScintillaBase.h LexAccessor.h Accessor.h \
- LexerModule.h Catalogue.h CaseFolder.h
-
-ScintillaWinL.o: ScintillaWin.cxx Platform.h \
- ILexer.h Scintilla.h SplitVector.h \
- Partitioning.h RunStyles.h ContractionState.h \
- CellBuffer.h CallTip.h KeyMap.h Indicator.h \
- XPM.h LineMarker.h Style.h AutoComplete.h \
- ViewStyle.h CharClassify.h Decoration.h \
- Document.h Selection.h PositionCache.h \
- EditModel.h Editor.h EditView.h ScintillaBase.h UniConversion.h \
- LexAccessor.h Accessor.h \
- LexerModule.h Catalogue.h CaseConvert.h \
- CaseFolder.h
-
 ScintillaBaseL.o:
 	$(CXX) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
 
-- 
cgit v1.2.3