X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/589e20d03c8fd08520ae279f5e5ebcc6efde321b..d471bb2d4c029e0f9a47e191fa28a56a5588f75e:/contrib/src/stc/Makefile.in

diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
index 870fa776d4..7775115607 100644
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -47,8 +47,10 @@ HOST_SUFFIX = @HOST_SUFFIX@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.2
 WX_RELEASE = 2.5
+WX_RELEASE_NODOT = 25
+WX_VERSION = $(WX_RELEASE).3
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
 LIBDIRNAME = $(top_builddir)lib
 STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
@@ -69,42 +71,50 @@ STCDLL_OBJECTS =  \
 	stcdll_Indicator.o \
 	stcdll_KeyMap.o \
 	stcdll_KeyWords.o \
+	stcdll_LexAPDL.o \
+	stcdll_LexAU3.o \
+	stcdll_LexAVE.o \
 	stcdll_LexAda.o \
 	stcdll_LexAsm.o \
-	stcdll_LexAVE.o \
 	stcdll_LexBaan.o \
+	stcdll_LexBash.o \
 	stcdll_LexBullant.o \
 	stcdll_LexCLW.o \
-	stcdll_LexConf.o \
 	stcdll_LexCPP.o \
-	stcdll_LexCrontab.o \
 	stcdll_LexCSS.o \
+	stcdll_LexConf.o \
+	stcdll_LexCrontab.o \
+	stcdll_LexEScript.o \
 	stcdll_LexEiffel.o \
 	stcdll_LexErlang.o \
-	stcdll_LexEScript.o \
 	stcdll_LexForth.o \
 	stcdll_LexFortran.o \
+	stcdll_LexGui4Cli.o \
 	stcdll_LexHTML.o \
+	stcdll_LexKix.o \
 	stcdll_LexLisp.o \
 	stcdll_LexLout.o \
 	stcdll_LexLua.o \
-	stcdll_LexMatlab.o \
-	stcdll_LexMetapost.o \
 	stcdll_LexMMIXAL.o \
 	stcdll_LexMPT.o \
+	stcdll_LexMSSQL.o \
+	stcdll_LexMatlab.o \
+	stcdll_LexMetapost.o \
 	stcdll_LexNsis.o \
 	stcdll_LexOthers.o \
-	stcdll_LexPascal.o \
 	stcdll_LexPB.o \
-	stcdll_LexPerl.o \
 	stcdll_LexPOV.o \
 	stcdll_LexPS.o \
+	stcdll_LexPascal.o \
+	stcdll_LexPerl.o \
 	stcdll_LexPython.o \
 	stcdll_LexRuby.o \
-	stcdll_LexScriptol.o \
 	stcdll_LexSQL.o \
+	stcdll_LexScriptol.o \
+	stcdll_LexSpecman.o \
 	stcdll_LexTeX.o \
 	stcdll_LexVB.o \
+	stcdll_LexVerilog.o \
 	stcdll_LexYAML.o \
 	stcdll_LineMarker.o \
 	stcdll_PropSet.o \
@@ -135,42 +145,50 @@ STCLIB_OBJECTS =  \
 	stclib_Indicator.o \
 	stclib_KeyMap.o \
 	stclib_KeyWords.o \
+	stclib_LexAPDL.o \
+	stclib_LexAU3.o \
+	stclib_LexAVE.o \
 	stclib_LexAda.o \
 	stclib_LexAsm.o \
-	stclib_LexAVE.o \
 	stclib_LexBaan.o \
+	stclib_LexBash.o \
 	stclib_LexBullant.o \
 	stclib_LexCLW.o \
-	stclib_LexConf.o \
 	stclib_LexCPP.o \
-	stclib_LexCrontab.o \
 	stclib_LexCSS.o \
+	stclib_LexConf.o \
+	stclib_LexCrontab.o \
+	stclib_LexEScript.o \
 	stclib_LexEiffel.o \
 	stclib_LexErlang.o \
-	stclib_LexEScript.o \
 	stclib_LexForth.o \
 	stclib_LexFortran.o \
+	stclib_LexGui4Cli.o \
 	stclib_LexHTML.o \
+	stclib_LexKix.o \
 	stclib_LexLisp.o \
 	stclib_LexLout.o \
 	stclib_LexLua.o \
-	stclib_LexMatlab.o \
-	stclib_LexMetapost.o \
 	stclib_LexMMIXAL.o \
 	stclib_LexMPT.o \
+	stclib_LexMSSQL.o \
+	stclib_LexMatlab.o \
+	stclib_LexMetapost.o \
 	stclib_LexNsis.o \
 	stclib_LexOthers.o \
-	stclib_LexPascal.o \
 	stclib_LexPB.o \
-	stclib_LexPerl.o \
 	stclib_LexPOV.o \
 	stclib_LexPS.o \
+	stclib_LexPascal.o \
+	stclib_LexPerl.o \
 	stclib_LexPython.o \
 	stclib_LexRuby.o \
-	stclib_LexScriptol.o \
 	stclib_LexSQL.o \
+	stclib_LexScriptol.o \
+	stclib_LexSpecman.o \
 	stclib_LexTeX.o \
 	stclib_LexVB.o \
+	stclib_LexVerilog.o \
 	stclib_LexYAML.o \
 	stclib_LineMarker.o \
 	stclib_PropSet.o \
@@ -198,9 +216,14 @@ STCLIB_OBJECTS =  \
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)252
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
+@COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 COND_SHARED_1___stcdll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
 @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
@@ -209,20 +232,20 @@ COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \
 	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd)
 COND_PLATFORM_OS2_1___stcdll___importlib = -import \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_OS2_1@__stcdll___importlib = $(COND_PLATFORM_OS2_1___stcdll___importlib)
 COND_PLATFORM_WIN32_1___stcdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).2
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).3
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .2.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .3.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__stcdll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).2.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).3.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .2.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .3.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX)
 COND_USE_SOVERLINUX_1___stcdll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
@@ -231,30 +254,30 @@ COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags)
 COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
 @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd)
 COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
-	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd)
 @COND_PLATFORM_MACOSX_1@__stcdll___macver = \
 @COND_PLATFORM_MACOSX_1@	-compatibility_version $(WX_VERSION) \
 @COND_PLATFORM_MACOSX_1@	-current_version $(WX_VERSION)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
@@ -268,20 +291,20 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 COND_SHARED_0___stclib___depname = \
-	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX)$(LIBEXT)
+	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 @COND_SHARED_0@__stclib___depname = $(COND_SHARED_0___stclib___depname)
 @COND_SHARED_0@__install_stclib___depname = install_stclib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -291,12 +314,12 @@ COND_SHARED_0___stclib___depname = \
 all: $(__stcdll___depname) $(__stclib___depname)
 
 install: all $(__install_stcdll___depname) $(__install_stclib___depname)
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
 	for f in wx/stc/stc.h; do \
-	if test ! -d $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)/`dirname $$f` ; then \
-	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)/`dirname $$f`; \
+	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f`; \
 	fi; \
-	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-2.5$(WX_FLAVOUR)/$$f; \
+	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
 	done
 
 uninstall: 
@@ -308,32 +331,32 @@ clean:
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
 	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
-	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX)$(LIBEXT)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
 
 distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 @COND_SHARED_1@	
 @COND_SHARED_1@	$(__stcdll___so_symlinks_cmd)
 
 @COND_SHARED_1@install_stcdll: 
 @COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
 @COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(DESTDIR)$(libdir)
 @COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS)
+@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS)
 @COND_SHARED_0@	rm -f $@
 @COND_SHARED_0@	$(AR) rcu $@ $(STCLIB_OBJECTS)
 @COND_SHARED_0@	$(RANLIB) $@
 
 @COND_SHARED_0@install_stclib: 
 @COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-2.5$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
 stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
@@ -377,34 +400,46 @@ stcdll_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
 stcdll_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
+stcdll_LexAPDL.o: $(srcdir)/scintilla/src/LexAPDL.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
+stcdll_LexAU3.o: $(srcdir)/scintilla/src/LexAU3.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+stcdll_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 stcdll_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+stcdll_LexBash.o: $(srcdir)/scintilla/src/LexBash.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 stcdll_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexCLW.o: $(srcdir)/scintilla/src/LexCLW.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
+stcdll_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
+stcdll_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
+stcdll_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
@@ -413,18 +448,21 @@ stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
 stcdll_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
-
 stcdll_LexForth.o: $(srcdir)/scintilla/src/LexForth.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+stcdll_LexGui4Cli.o: $(srcdir)/scintilla/src/LexGui4Cli.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 stcdll_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+stcdll_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 stcdll_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
@@ -434,16 +472,19 @@ stcdll_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
 stcdll_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
+stcdll_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
+stcdll_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
+stcdll_LexMSSQL.o: $(srcdir)/scintilla/src/LexMSSQL.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
+stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
@@ -452,19 +493,19 @@ stcdll_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
 stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
+stcdll_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
+stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
+stcdll_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
+stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
+stcdll_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
@@ -473,10 +514,13 @@ stcdll_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
 stcdll_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+stcdll_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 stcdll_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
+stcdll_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
@@ -485,6 +529,9 @@ stcdll_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
 stcdll_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
+stcdll_LexVerilog.o: $(srcdir)/scintilla/src/LexVerilog.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
 stcdll_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
 	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
@@ -560,34 +607,46 @@ stclib_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
 stclib_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
+stclib_LexAPDL.o: $(srcdir)/scintilla/src/LexAPDL.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
+stclib_LexAU3.o: $(srcdir)/scintilla/src/LexAU3.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+stclib_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 stclib_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+stclib_LexBash.o: $(srcdir)/scintilla/src/LexBash.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 stclib_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexCLW.o: $(srcdir)/scintilla/src/LexCLW.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
+stclib_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
+stclib_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
+stclib_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
@@ -596,18 +655,21 @@ stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
 stclib_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
 stclib_LexForth.o: $(srcdir)/scintilla/src/LexForth.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+stclib_LexGui4Cli.o: $(srcdir)/scintilla/src/LexGui4Cli.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 stclib_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+stclib_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 stclib_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
@@ -617,16 +679,19 @@ stclib_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
 stclib_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
+stclib_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
+stclib_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
+stclib_LexMSSQL.o: $(srcdir)/scintilla/src/LexMSSQL.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
+stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
@@ -635,19 +700,19 @@ stclib_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
 stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
+stclib_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
+stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
+stclib_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
+stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
+stclib_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
@@ -656,10 +721,13 @@ stclib_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
 stclib_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+stclib_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 stclib_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
+stclib_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
@@ -668,6 +736,9 @@ stclib_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
 stclib_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
+stclib_LexVerilog.o: $(srcdir)/scintilla/src/LexVerilog.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
 stclib_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
 	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<