Moved header dependencies to automatically generated deps.mak.

Include directories merged into CXXFLAGS for compatibility with other
makefiles.

2 files changed, 105 insertions, 60 deletions

diff --git a/gtk/deps.mak b/gtk/deps.mak
new file mode 100644
index 000000000..904c5dbac
--- /dev/null
+++ b/gtk/deps.mak
@@ -0,0 +1,95 @@
+PlatGTK.o: PlatGTK.cxx ../include/Platform.h ../include/Scintilla.h \
+ ../include/ScintillaWidget.h
+ScintillaGTK.o: ScintillaGTK.cxx ../include/Platform.h \
+ ../include/Scintilla.h ../include/ScintillaWidget.h \
+ ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
+ ../include/Accessor.h ../include/KeyWords.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
+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 ../include/WinDefs.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
+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
+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
+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
+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
+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 \
+ ../include/SciLexer.h ../include/Accessor.h ../src/DocumentAccessor.h \
+ ../include/KeyWords.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/gtk/makefile b/gtk/makefile
index 38d920f32..279ca8d7a 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -14,7 +14,7 @@ vpath %.h ../src ../include
 vpath %.cxx ../src
 
 INCLUDEDIRS=-I ../include -I ../src
-CXXBASEFLAGS= -DGTK -DSCI_LEXER -W -Wall
+CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER $(INCLUDEDIRS)
 
 ifdef DEBUG
 CXXFLAGS=-DDEBUG $(CXXBASEFLAGS)
@@ -23,7 +23,7 @@ CXXFLAGS=-DNDEBUG $(CXXBASEFLAGS)
 endif
 
 .cxx.o:
-	$(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@
+	$(CC) `gtk-config --cflags` $(CXXFLAGS) -c $<
 
 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
@@ -32,67 +32,17 @@ LEXOBJS	= LexAda.o LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o \
 
 all: $(COMPLIB) $(LEXOBJS)
 
+clean:
+	rm -f *.o $(COMPLIB)
+
+deps:
+	$(CC) -MM `gtk-config --cflags` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
+
 $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o Document.o CallTip.o \
 	ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \
 	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
 	RESearch.o Style.o Indicator.o AutoComplete.o
 	$(AR) rc $@ $^
 
-# 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 WinDefs.h \
- CellBuffer.h
-ContractionState.o: ContractionState.cxx Platform.h ContractionState.h
-Document.o: Document.cxx Platform.h Scintilla.h WinDefs.h RESearch.h \
- CellBuffer.h Document.h
-DocumentAccessor.o: DocumentAccessor.cxx Platform.h PropSet.h SString.h \
- Accessor.h DocumentAccessor.h Scintilla.h WinDefs.h
-Editor.o: Editor.cxx Platform.h Scintilla.h WinDefs.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 WinDefs.h \
- Indicator.h
-KeyMap.o: KeyMap.cxx Platform.h Scintilla.h WinDefs.h KeyMap.h
-KeyWords.o: KeyWords.cxx Platform.h PropSet.h SString.h Accessor.h \
- KeyWords.h Scintilla.h WinDefs.h SciLexer.h
-LexAda.o: LexAda.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)
-LineMarker.o: LineMarker.cxx Platform.h Scintilla.h WinDefs.h \
- LineMarker.h
-PlatGTK.o: PlatGTK.cxx Platform.h Scintilla.h ScintillaWidget.h WinDefs.h
-PropSet.o: PropSet.cxx Platform.h PropSet.h SString.h
-RESearch.o: RESearch.cxx RESearch.h
-SciTEBase.o: SciTEBase.cxx Platform.h WinDefs.h SciTE.h PropSet.h \
- SString.h Accessor.h KeyWords.h Scintilla.h SciLexer.h SciTEBase.h
-SciTEGTK.o: SciTEGTK.cxx Platform.h WinDefs.h SciTE.h PropSet.h \
- SString.h Accessor.h KeyWords.h Scintilla.h SciTEBase.h
-ScintillaBase.o: ScintillaBase.cxx Platform.h Scintilla.h WinDefs.h \
- SciLexer.h PropSet.h SString.h Accessor.h KeyWords.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
-ScintillaGTK.o: ScintillaGTK.cxx Platform.h Scintilla.h ScintillaWidget.h WinDefs.h \
- SciLexer.h PropSet.h SString.h Accessor.h KeyWords.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
-Style.o: Style.cxx Platform.h Style.h
-ViewStyle.o: ViewStyle.cxx Platform.h Scintilla.h WinDefs.h \
- Indicator.h LineMarker.h Style.h ViewStyle.h
-WindowAccessor.o: WindowAccessor.cxx Platform.h PropSet.h SString.h \
- Accessor.h WindowAccessor.h Scintilla.h WinDefs.h
-
-clean:
-	rm -f *.o SciTE
+# Automatically generate header dependencies with "make deps"
+include deps.mak