HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update autotools-based build system for Scintilla.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5441 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2010-11-24 21:43:31 +00:00
parent c9536ccd02
commit 5fb38517e3
3 changed files with 116 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@
remove unused lexers.
* wscript:
Update Waf-based build system for Scintilla.
* scintilla/Makefile.am, scintilla/include/Makefile.am:
Update autotools-based build system for Scintilla.
2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

210
scintilla/Makefile.am
View File

@ -3,111 +3,125 @@ SUBDIRS = include
noinst_LIBRARIES=libscintilla.a
AM_CXXFLAGS = -DNDEBUG -DGTK -DGTK2 -DSCI_LEXER -DG_THREADS_IMPL_NONE
AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DG_THREADS_IMPL_NONE
LEXER_SRCS= \
LexAda.cxx \
LexAsm.cxx \
LexBasic.cxx \
LexBash.cxx \
LexCPP.cxx \
LexCaml.cxx \
LexCmake.cxx \
LexCSS.cxx \
LexD.cxx \
LexErlang.cxx \
LexForth.cxx \
LexFortran.cxx \
LexHaskell.cxx \
LexHTML.cxx \
LexLisp.cxx \
LexLua.cxx \
LexMarkdown.cxx \
LexMatlab.cxx \
LexNsis.cxx \
LexOthers.cxx \
LexPascal.cxx \
LexPerl.cxx \
LexPython.cxx \
LexR.cxx \
LexRuby.cxx \
LexSQL.cxx \
LexTxt2tags.cxx \
LexTCL.cxx \
LexVHDL.cxx \
LexVerilog.cxx \
LexYAML.cxx
lexers/LexAda.cxx \
lexers/LexAsm.cxx \
lexers/LexBash.cxx \
lexers/LexBasic.cxx \
lexers/LexCPP.cxx \
lexers/LexCSS.cxx \
lexers/LexCaml.cxx \
lexers/LexCmake.cxx \
lexers/LexD.cxx \
lexers/LexErlang.cxx \
lexers/LexForth.cxx \
lexers/LexFortran.cxx \
lexers/LexHTML.cxx \
lexers/LexHaskell.cxx \
lexers/LexLisp.cxx \
lexers/LexLua.cxx \
lexers/LexMarkdown.cxx \
lexers/LexMatlab.cxx \
lexers/LexNsis.cxx \
lexers/LexOthers.cxx \
lexers/LexPascal.cxx \
lexers/LexPerl.cxx \
lexers/LexPython.cxx \
lexers/LexR.cxx \
lexers/LexRuby.cxx \
lexers/LexSQL.cxx \
lexers/LexTCL.cxx \
lexers/LexTxt2tags.cxx \
lexers/LexVHDL.cxx \
lexers/LexVerilog.cxx \
lexers/LexYAML.cxx
SRCS= \
CallTip.cxx \
CellBuffer.cxx \
CharClassify.cxx \
ContractionState.cxx \
Decoration.cxx \
DocumentAccessor.cxx \
Document.cxx \
Editor.cxx \
Indicator.cxx \
KeyMap.cxx \
KeyWords.cxx \
LineMarker.cxx \
PerLine.cxx \
PositionCache.cxx \
PropSet.cxx \
RESearch.cxx \
RunStyles.cxx \
ScintillaBase.cxx \
Selection.cxx \
StyleContext.cxx \
Style.cxx \
UniConversion.cxx \
ViewStyle.cxx \
WindowAccessor.cxx \
XPM.cxx \
AutoComplete.cxx \
ExternalLexer.cxx \
PlatGTK.cxx \
ScintillaGTK.cxx \
AutoComplete.h \
CallTip.h \
CellBuffer.h \
CharClassify.h \
CharacterSet.h \
ContractionState.h \
Converter.h \
Decoration.h \
DocumentAccessor.h \
Document.h \
Editor.h \
ExternalLexer.h \
Indicator.h \
KeyMap.h \
LineMarker.h \
Partitioning.h \
PerLine.h \
PositionCache.h \
PropSetSimple.h \
RESearch.h \
RunStyles.h \
ScintillaBase.h \
scintilla-marshal.h \
Selection.h \
SplitVector.h \
StyleContext.h \
Style.h \
SVector.h \
UniConversion.h \
ViewStyle.h \
XPM.h \
scintilla-marshal.c \
gtk/Converter.h \
gtk/PlatGTK.cxx \
gtk/ScintillaGTK.cxx \
gtk/scintilla-marshal.c \
gtk/scintilla-marshal.h \
lexlib/Accessor.cxx \
lexlib/Accessor.h \
lexlib/CharacterSet.cxx \
lexlib/CharacterSet.h \
lexlib/LexAccessor.h \
lexlib/LexerBase.cxx \
lexlib/LexerBase.h \
lexlib/LexerModule.cxx \
lexlib/LexerModule.h \
lexlib/LexerNoExceptions.cxx \
lexlib/LexerNoExceptions.h \
lexlib/LexerSimple.cxx \
lexlib/LexerSimple.h \
lexlib/OptionSet.h \
lexlib/PropSetSimple.cxx \
lexlib/PropSetSimple.h \
lexlib/StyleContext.cxx \
lexlib/StyleContext.h \
lexlib/WordList.cxx \
lexlib/WordList.h \
src/AutoComplete.cxx \
src/AutoComplete.h \
src/CallTip.cxx \
src/CallTip.h \
src/Catalogue.cxx \
src/Catalogue.h \
src/CellBuffer.cxx \
src/CellBuffer.h \
src/CharClassify.cxx \
src/CharClassify.h \
src/ContractionState.cxx \
src/ContractionState.h \
src/Decoration.cxx \
src/Decoration.h \
src/Document.cxx \
src/Document.h \
src/Editor.cxx \
src/Editor.h \
src/ExternalLexer.cxx \
src/ExternalLexer.h \
src/FontQuality.h \
src/Indicator.cxx \
src/Indicator.h \
src/KeyMap.cxx \
src/KeyMap.h \
src/LineMarker.cxx \
src/LineMarker.h \
src/Partitioning.h \
src/PerLine.cxx \
src/PerLine.h \
src/PositionCache.cxx \
src/PositionCache.h \
src/RESearch.cxx \
src/RESearch.h \
src/RunStyles.cxx \
src/RunStyles.h \
src/SVector.h \
src/ScintillaBase.cxx \
src/ScintillaBase.h \
src/Selection.cxx \
src/Selection.h \
src/SplitVector.h \
src/Style.cxx \
src/Style.h \
src/UniConversion.cxx \
src/UniConversion.h \
src/ViewStyle.cxx \
src/ViewStyle.h \
src/XPM.cxx \
src/XPM.h \
$(LEXER_SRCS)
libscintilla_a_SOURCES = $(SRCS)
INCLUDES=-I$(top_srcdir) -I$(srcdir)/include @GTK_CFLAGS@
INCLUDES=-I$(top_srcdir) -I$(srcdir)/include -I$(srcdir)/src -I$(srcdir)/lexlib @GTK_CFLAGS@
marshallers: scintilla-marshal.list
glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --header > scintilla-marshal.h
glib-genmarshal --prefix scintilla_marshal scintilla-marshal.list --body > scintilla-marshal.c
marshallers: gtk/scintilla-marshal.list
glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --header > gtk/scintilla-marshal.h
glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --body > gtk/scintilla-marshal.c
EXTRA_DIST=scintilla-marshal.list scintilla-marshal.c scintilla-marshal.h License.txt
EXTRA_DIST=gtk/scintilla-marshal.list License.txt

8
scintilla/include/Makefile.am
View File

@ -1,12 +1,8 @@
## Process this file with automake to produce Makefile.in
noinst_HEADERS = \
Accessor.h \
KeyWords.h \
Platform.h \
PropSet.h \
WindowAccessor.h \
SString.h
ILexer.h \
Platform.h
scintilla_includedir = $(includedir)/geany/scintilla/
scintilla_include_HEADERS = \