Stopped automatic generation of dependencies - requires "make deps" now.

2 files changed, 4 insertions, 99 deletions

diff --git a/win32/depend b/win32/depend
deleted file mode 100644
index 993dfe631..000000000
--- a/win32/depend
+++ /dev/null
@@ -1,95 +0,0 @@
-PlatWin.o: PlatWin.cxx ..\include\Platform.h PlatformRes.h \
- ..\src\UniConversion.h
-ScintillaWin.o: ScintillaWin.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\include\SString.h ..\src\ContractionState.h \
- ..\src\SVector.h ..\src\CellBuffer.h ..\src\CallTip.h ..\src\KeyMap.h \
- ..\src\Indicator.h ..\src\LineMarker.h ..\src\Style.h \
- ..\src\AutoComplete.h ..\src\ViewStyle.h ..\src\Document.h \
- ..\src\Editor.h ..\src\ScintillaBase.h ..\src\UniConversion.h
-AutoComplete.o: ../src/AutoComplete.cxx ..\include\Platform.h \
- ..\src\AutoComplete.h
-CallTip.o: ../src/CallTip.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\CallTip.h
-CellBuffer.o: ../src/CellBuffer.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\SVector.h ..\src\CellBuffer.h
-ContractionState.o: ../src/ContractionState.cxx ..\include\Platform.h \
- ..\src\ContractionState.h
-Document.o: ../src/Document.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\SVector.h ..\src\CellBuffer.h \
- ..\src\Document.h ..\src\RESearch.h
-DocumentAccessor.o: ../src/DocumentAccessor.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\src\SVector.h \
- ..\include\Accessor.h ..\src\DocumentAccessor.h ..\src\CellBuffer.h \
- ..\include\Scintilla.h ..\src\Document.h
-Editor.o: ../src/Editor.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\ContractionState.h ..\src\SVector.h \
- ..\src\CellBuffer.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\ViewStyle.h \
- ..\src\Document.h ..\src\Editor.h
-Indicator.o: ../src/Indicator.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\Indicator.h
-KeyMap.o: ../src/KeyMap.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\KeyMap.h
-KeyWords.o: ../src/KeyWords.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexAda.o: ../src/LexAda.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LexAVE.o: ../src/LexAVE.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LexConf.o: ../src/LexConf.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexCPP.o: ../src/LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LexerManager.o: ../src/LexerManager.cxx ..\include\SciLexer.h \
- ..\include\platform.h ..\include\propset.h ..\include\SString.h \
- ..\include\accessor.h ..\include\KeyWords.h ..\include\LexerManager.h
-LexHTML.o: ../src/LexHTML.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexLua.o: ../src/LexLua.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LexOthers.o: ../src/LexOthers.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexPascal.o: ../src/LexPascal.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexPerl.o: ../src/LexPerl.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexPython.o: ../src/LexPython.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\KeyWords.h ..\include\Scintilla.h ..\include\SciLexer.h
-LexSQL.o: ../src/LexSQL.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LexVB.o: ../src/LexVB.cxx ..\include\Platform.h ..\include\PropSet.h \
- ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \
- ..\include\Scintilla.h ..\include\SciLexer.h
-LineMarker.o: ../src/LineMarker.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\LineMarker.h
-PropSet.o: ../src/PropSet.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h
-RESearch.o: ../src/RESearch.cxx ..\src\RESearch.h
-ScintillaBase.o: ../src/ScintillaBase.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\include\PropSet.h ..\include\SString.h \
- ..\src\ContractionState.h ..\src\SVector.h ..\src\CellBuffer.h \
- ..\src\CallTip.h ..\src\KeyMap.h ..\src\Indicator.h \
- ..\src\LineMarker.h ..\src\Style.h ..\src\ViewStyle.h \
- ..\src\AutoComplete.h ..\src\Document.h ..\src\Editor.h \
- ..\src\ScintillaBase.h
-Style.o: ../src/Style.cxx ..\include\Platform.h ..\include\Scintilla.h \
- ..\src\Style.h
-UniConversion.o: ../src/UniConversion.cxx ..\src\UniConversion.h
-ViewStyle.o: ../src/ViewStyle.cxx ..\include\Platform.h \
- ..\include\Scintilla.h ..\src\Indicator.h ..\src\LineMarker.h \
- ..\src\Style.h ..\src\ViewStyle.h
-WindowAccessor.o: ../src/WindowAccessor.cxx ..\include\Platform.h \
- ..\include\PropSet.h ..\include\SString.h ..\include\Accessor.h \
- ..\include\WindowAccessor.h ..\include\Scintilla.h
diff --git a/win32/makefile b/win32/makefile
index 493cc30b6..eda592a7d 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -34,8 +34,8 @@ ALL:	$(COMPONENT) $(LEXCOMPONENT) ScintillaWinS.o WindowAccessor.o
 clean:
 	del /q *.exe *.o *.obj *.dll *.res *.map
 
-depend: *.cxx ../src/*.cxx 
-	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >depend
+deps:
+	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
 
 LEXOBJS	= LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o \
 	LexOthers.o LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o
@@ -55,8 +55,8 @@ LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \
 $(LEXCOMPONENT): $(LOBJS)
 	$(DLLWRAP) --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable
 
-# Automatically generate dependencies for most files with "make depend"
-include depend
+# 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 Scintilla.h SciLexer.h \