Moved most header dependencies to automatically generated depend file.

Rule for building depend.
Removed -o $@ from main .cxx -> .o rule as that is the default anyway.

1 files changed, 8 insertions, 49 deletions

diff --git a/win32/makefile b/win32/makefile
index a7ab56835..ea8335a8e 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -27,13 +27,16 @@ CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
 endif
 
 .cxx.o:
-	$(CC) $(CXXFLAGS) -c $< -o $@
+	$(CC) $(CXXFLAGS) -c $<
 
 ALL:	$(COMPONENT) $(LEXCOMPONENT) ScintillaWinS.o WindowAccessor.o
 
 clean:
 	del /q *.exe *.o *.obj *.dll *.res *.map
 
+depend: *.cxx ../src/*.cxx 
+	g++ -MM $(CXXFLAGS) *.cxx ../src/*.cxx >depend
+
 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
 
@@ -52,53 +55,14 @@ LOBJS	= ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \
 $(LEXCOMPONENT): $(LOBJS)
 	$(DLLWRAP) --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable
 
-# All lexers depend on this set of headers
-LEX_HEADERS=Platform.h PropSet.h SString.h Accessor.h \
- KeyWords.h Scintilla.h WinDefs.h SciLexer.h
-
-AutoComplete.o: AutoComplete.cxx Platform.h AutoComplete.h
-CallTip.o: CallTip.cxx Platform.h CallTip.h
-CellBuffer.o: CellBuffer.cxx Platform.h Scintilla.h CellBuffer.h
-ContractionState.o: ContractionState.cxx Platform.h ContractionState.h
-Document.o: Document.cxx Platform.h Scintilla.h RESearch.h CellBuffer.h \
- Document.h
-DocumentAccessor.o: DocumentAccessor.cxx Platform.h PropSet.h \
- SString.h Accessor.h DocumentAccessor.h Scintilla.h
-Editor.o: Editor.cxx Platform.h Scintilla.h ContractionState.h \
- CellBuffer.h KeyMap.h Indicator.h LineMarker.h Style.h ViewStyle.h \
- Document.h Editor.h
-Indicator.o: Indicator.cxx Platform.h Scintilla.h Indicator.h
-KeyMap.o: KeyMap.cxx Platform.h Scintilla.h KeyMap.h
-LexAda.o: LexAVE.cxx $(LEX_HEADERS)
-LexAVE.o: LexAVE.cxx $(LEX_HEADERS)
-LexConf.o: LexConf.cxx $(LEX_HEADERS)
-LexCPP.o: LexCPP.cxx $(LEX_HEADERS)
-LexHTML.o: LexHTML.cxx $(LEX_HEADERS)
-LexLua.o: LexLua.cxx $(LEX_HEADERS)
-LexOthers.o: LexOthers.cxx $(LEX_HEADERS)
-LexPascal.o: LexPascal.cxx $(LEX_HEADERS)
-LexPerl.o: LexPerl.cxx $(LEX_HEADERS)
-LexPython.o: LexPython.cxx $(LEX_HEADERS)
-LexSQL.o: LexSQL.cxx $(LEX_HEADERS)
-LexVB.o: LexVB.cxx $(LEX_HEADERS)
-KeyWords.o: KeyWords.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \
- Scintilla.h SciLexer.h
-LineMarker.o: LineMarker.cxx Platform.h Scintilla.h LineMarker.h
-PlatWin.o: PlatWin.cxx Platform.h PlatformRes.h UniConversion.h
-PropSet.o: PropSet.cxx Platform.h PropSet.h SString.h
-RESearch.o: RESearch.cxx RESearch.h
-ScintillaBase.o: ScintillaBase.cxx Platform.h Scintilla.h \
- ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
- LineMarker.h Style.h ViewStyle.h AutoComplete.h Document.h Editor.h \
- ScintillaBase.h
+# Automatically generate dependencies for most files with "make depends"
+include depend
+
+# 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 \
  ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
  LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \
  ScintillaBase.h PropSet.h SString.h Accessor.h DocumentAccessor.h KeyWords.h
-ScintillaWin.o: ScintillaWin.cxx Platform.h Scintilla.h \
- ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
- LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \
- ScintillaBase.h UniConversion.h
 ScintillaWinL.o: ScintillaWin.cxx Platform.h Scintilla.h SciLexer.h \
  ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
  LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \
@@ -107,11 +71,6 @@ ScintillaWinS.o: ScintillaWin.cxx Platform.h Scintilla.h \
  ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \
  LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \
  ScintillaBase.h UniConversion.h
-Style.o: Style.cxx Platform.h Style.h
-UniConversion.o: UniConversion.cxx UniConversion.h
-ViewStyle.o: ViewStyle.cxx Platform.h Scintilla.h Indicator.h \
- LineMarker.h Style.h ViewStyle.h
-WindowAccessor.o: DocumentAccessor.cxx Platform.h PropSet.h SString.h Accessor.h WindowAccessor.h Scintilla.h
 
 ScintillaBaseL.o:
 	$(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@