Lexers now added to library.

2 files changed, 65 insertions, 13 deletions

diff --git a/gtk/deps.mak b/gtk/deps.mak
index 0dd52a9c4..f512617ba 100644
--- a/gtk/deps.mak
+++ b/gtk/deps.mak
@@ -1,14 +1,18 @@
-PlatGTK.o: PlatGTK.cxx ../include/Platform.h ../include/Scintilla.h \

-  ../include/ScintillaWidget.h ../src/UniConversion.h ../src/XPM.h

-ScintillaGTK.o: ScintillaGTK.cxx ../include/Platform.h \

-  ../include/Scintilla.h ../include/ScintillaWidget.h \

+PlatGTK.o: PlatGTK.cxx \
+  ../include/Platform.h \
+  ../include/Scintilla.h ../include/ScintillaWidget.h \
+  ../src/UniConversion.h ../src/XPM.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/XPM.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/Editor.h ../src/ScintillaBase.h ../src/UniConversion.h \
+  ../src/ExternalLexer.h
+AutoComplete.o: ../src/AutoComplete.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../src/AutoComplete.h

 CallTip.o: ../src/CallTip.cxx ../include/Platform.h \

   ../include/Scintilla.h ../src/CallTip.h

@@ -28,9 +32,9 @@ Editor.o: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \
   ../src/KeyMap.h ../src/Indicator.h ../src/XPM.h ../src/LineMarker.h \

   ../src/Style.h ../src/ViewStyle.h ../src/Document.h ../src/Editor.h

 ExternalLexer.o: ../src/ExternalLexer.cxx ../include/Platform.h \

- ../include/Scintilla.h ../include/SciLexer.h ../include/PropSet.h \

- ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \

- ../src/ExternalLexer.h

+  ../include/SciLexer.h ../include/PropSet.h ../include/SString.h \
+  ../include/Accessor.h ../src/DocumentAccessor.h ../include/KeyWords.h \
+  ../src/ExternalLexer.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 \

@@ -53,6 +57,9 @@ LexBaan.o: ../src/LexBaan.cxx ../include/Platform.h ../include/PropSet.h \
 LexBullant.o: ../src/LexBullant.cxx ../include/Platform.h \

   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \

   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h

+LexCLW.o: ../src/LexCLW.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.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

@@ -69,6 +76,17 @@ LexEiffel.o: ../src/LexEiffel.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \

   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \

   ../include/SciLexer.h

+LexErlang.o: ../src/LexErlang.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
+LexEScript.o: ../src/LexEScript.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
+LexForth.o: ../src/LexForth.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LexFortran.o: ../src/LexFortran.cxx ../include/Platform.h \

   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \

   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \

@@ -79,6 +97,9 @@ LexHTML.o: ../src/LexHTML.cxx ../include/Platform.h ../include/PropSet.h \
 LexLisp.o: ../src/LexLisp.cxx ../include/Platform.h ../include/PropSet.h \

   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \

   ../include/Scintilla.h ../include/SciLexer.h

+LexLout.o: ../src/LexLout.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.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 ../src/StyleContext.h \

   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h

@@ -86,6 +107,20 @@ LexMatlab.o: ../src/LexMatlab.cxx ../include/Platform.h \
   ../include/PropSet.h ../include/SString.h ../include/Accessor.h \

   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \

   ../include/SciLexer.h

+LexMetapost.o: ../src/LexMetapost.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h \
+  ../src/StyleContext.h
+LexMMIXAL.o: ../src/LexMMIXAL.cxx ../include/Platform.h \
+  ../include/PropSet.h ../include/SString.h ../include/Accessor.h \
+  ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \
+  ../include/SciLexer.h
+LexMPT.o: ../src/LexMPT.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
+  ../include/Scintilla.h ../include/SciLexer.h
+LexNsis.o: ../src/LexNsis.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

@@ -93,9 +128,18 @@ 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 \

   ../src/StyleContext.h

+LexPB.o: ../src/LexPB.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.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

+LexPOV.o: ../src/LexPOV.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
+LexPS.o: ../src/LexPS.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.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 \

   ../src/StyleContext.h ../include/KeyWords.h ../include/Scintilla.h \

@@ -103,12 +147,21 @@ LexPython.o: ../src/LexPython.cxx ../include/Platform.h \
 LexRuby.o: ../src/LexRuby.cxx ../include/Platform.h ../include/PropSet.h \

   ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \

   ../include/Scintilla.h ../include/SciLexer.h

+LexScriptol.o: ../src/LexScriptol.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

+LexTeX.o: ../src/LexTeX.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../include/KeyWords.h \
+  ../include/Scintilla.h ../include/SciLexer.h ../src/StyleContext.h
 LexVB.o: ../src/LexVB.cxx ../include/Platform.h ../include/PropSet.h \

   ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \

   ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h

+LexYAML.o: ../src/LexYAML.cxx ../include/Platform.h ../include/PropSet.h \
+  ../include/SString.h ../include/Accessor.h ../src/StyleContext.h \
+  ../include/KeyWords.h ../include/Scintilla.h ../include/SciLexer.h
 LineMarker.o: ../src/LineMarker.cxx ../include/Platform.h \

   ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h

 PropSet.o: ../src/PropSet.cxx ../include/Platform.h ../include/PropSet.h \

diff --git a/gtk/makefile b/gtk/makefile
index 7560e439a..685a11173 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -68,9 +68,7 @@ LexPOV.o LexPS.o LexPython.o LexRuby.o LexScriptol.o LexSQL.o LexTeX.o LexVB.o \
 LexYAML.o 
 #--Autogenerated -- end of automatically generated section
 
-# The LEXOBJS have to be treated specially as the functions in them are not called from external code
-
-all: $(COMPLIB) $(LEXOBJS)
+all: $(COMPLIB)
 
 clean:
 	rm -f *.o $(COMPLIB)
@@ -81,7 +79,8 @@ deps:
 $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
 	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
 	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
-	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
+	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+	$(LEXOBJS)
 	$(AR) rc $@ $^
 	$(RANLIB) $@