X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e3165d72520d7d642640ed57c58c620884848fc..03c6117e8f6c958c1bc2602132ded643fc703cbf:/src/stc/Makefile.in

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index 7775115607..35a213e58d 100644
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -16,19 +16,22 @@ LIBPREFIX = @LIBPREFIX@
 SO_SUFFIX = @SO_SUFFIX@
 DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
 LN_S = @LN_S@
+WINDRES = @WINDRES@
 PIC_FLAG = @PIC_FLAG@
 SONAME_FLAG = @SONAME_FLAG@
 STRIP = @STRIP@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
+BK_DEPS = @BK_DEPS@
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
 libdir = @libdir@
 includedir = @includedir@
 DLLPREFIX = @DLLPREFIX@
+LIBS = @LIBS@
 AR = @AR@
+AROPTIONS = @AROPTIONS@
 RANLIB = @RANLIB@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
@@ -40,32 +43,36 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
 
 ### Variables: ###
 
 DESTDIR = 
-WX_RELEASE = 2.5
-WX_RELEASE_NODOT = 25
-WX_VERSION = $(WX_RELEASE).3
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
-LIBDIRNAME = $(top_builddir)lib
+WX_RELEASE = 2.9
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+LIBDIRNAME = $(wx_top_builddir)/lib
 STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
 	-I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \
 	-DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 STCDLL_OBJECTS =  \
+	$(__stcdll___win32rc) \
 	stcdll_PlatWX.o \
 	stcdll_ScintillaWX.o \
 	stcdll_stc.o \
 	stcdll_AutoComplete.o \
 	stcdll_CallTip.o \
 	stcdll_CellBuffer.o \
+	stcdll_CharClassify.o \
 	stcdll_ContractionState.o \
-	stcdll_DocumentAccessor.o \
 	stcdll_Document.o \
+	stcdll_DocumentAccessor.o \
 	stcdll_Editor.o \
 	stcdll_ExternalLexer.o \
 	stcdll_Indicator.o \
@@ -76,21 +83,28 @@ STCDLL_OBJECTS =  \
 	stcdll_LexAVE.o \
 	stcdll_LexAda.o \
 	stcdll_LexAsm.o \
+	stcdll_LexAsn1.o \
 	stcdll_LexBaan.o \
 	stcdll_LexBash.o \
+	stcdll_LexBasic.o \
 	stcdll_LexBullant.o \
 	stcdll_LexCLW.o \
 	stcdll_LexCPP.o \
 	stcdll_LexCSS.o \
+	stcdll_LexCaml.o \
+	stcdll_LexCsound.o \
 	stcdll_LexConf.o \
 	stcdll_LexCrontab.o \
 	stcdll_LexEScript.o \
 	stcdll_LexEiffel.o \
 	stcdll_LexErlang.o \
+	stcdll_LexFlagship.o \
 	stcdll_LexForth.o \
 	stcdll_LexFortran.o \
 	stcdll_LexGui4Cli.o \
 	stcdll_LexHTML.o \
+	stcdll_LexHaskell.o \
+	stcdll_LexInno.o \
 	stcdll_LexKix.o \
 	stcdll_LexLisp.o \
 	stcdll_LexLout.o \
@@ -101,6 +115,7 @@ STCDLL_OBJECTS =  \
 	stcdll_LexMatlab.o \
 	stcdll_LexMetapost.o \
 	stcdll_LexNsis.o \
+	stcdll_LexOpal.o \
 	stcdll_LexOthers.o \
 	stcdll_LexPB.o \
 	stcdll_LexPOV.o \
@@ -108,25 +123,32 @@ STCDLL_OBJECTS =  \
 	stcdll_LexPascal.o \
 	stcdll_LexPerl.o \
 	stcdll_LexPython.o \
+	stcdll_LexRebol.o \
 	stcdll_LexRuby.o \
 	stcdll_LexSQL.o \
+	stcdll_LexSmalltalk.o \
+	stcdll_LexTADS3.o \
 	stcdll_LexScriptol.o \
 	stcdll_LexSpecman.o \
+	stcdll_LexSpice.o \
+	stcdll_LexTCL.o \
 	stcdll_LexTeX.o \
 	stcdll_LexVB.o \
+	stcdll_LexVHDL.o \
 	stcdll_LexVerilog.o \
 	stcdll_LexYAML.o \
 	stcdll_LineMarker.o \
 	stcdll_PropSet.o \
 	stcdll_RESearch.o \
 	stcdll_ScintillaBase.o \
-	stcdll_StyleContext.o \
 	stcdll_Style.o \
+	stcdll_StyleContext.o \
 	stcdll_UniConversion.o \
 	stcdll_ViewStyle.o \
 	stcdll_WindowAccessor.o \
 	stcdll_XPM.o
 STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
 	-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
 	-I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \
 	$(CXXFLAGS)
@@ -137,9 +159,10 @@ STCLIB_OBJECTS =  \
 	stclib_AutoComplete.o \
 	stclib_CallTip.o \
 	stclib_CellBuffer.o \
+	stclib_CharClassify.o \
 	stclib_ContractionState.o \
-	stclib_DocumentAccessor.o \
 	stclib_Document.o \
+	stclib_DocumentAccessor.o \
 	stclib_Editor.o \
 	stclib_ExternalLexer.o \
 	stclib_Indicator.o \
@@ -150,21 +173,28 @@ STCLIB_OBJECTS =  \
 	stclib_LexAVE.o \
 	stclib_LexAda.o \
 	stclib_LexAsm.o \
+	stclib_LexAsn1.o \
 	stclib_LexBaan.o \
 	stclib_LexBash.o \
+	stclib_LexBasic.o \
 	stclib_LexBullant.o \
 	stclib_LexCLW.o \
 	stclib_LexCPP.o \
 	stclib_LexCSS.o \
+	stclib_LexCaml.o \
+	stclib_LexCsound.o \
 	stclib_LexConf.o \
 	stclib_LexCrontab.o \
 	stclib_LexEScript.o \
 	stclib_LexEiffel.o \
 	stclib_LexErlang.o \
+	stclib_LexFlagship.o \
 	stclib_LexForth.o \
 	stclib_LexFortran.o \
 	stclib_LexGui4Cli.o \
 	stclib_LexHTML.o \
+	stclib_LexHaskell.o \
+	stclib_LexInno.o \
 	stclib_LexKix.o \
 	stclib_LexLisp.o \
 	stclib_LexLout.o \
@@ -175,6 +205,7 @@ STCLIB_OBJECTS =  \
 	stclib_LexMatlab.o \
 	stclib_LexMetapost.o \
 	stclib_LexNsis.o \
+	stclib_LexOpal.o \
 	stclib_LexOthers.o \
 	stclib_LexPB.o \
 	stclib_LexPOV.o \
@@ -182,20 +213,26 @@ STCLIB_OBJECTS =  \
 	stclib_LexPascal.o \
 	stclib_LexPerl.o \
 	stclib_LexPython.o \
+	stclib_LexRebol.o \
 	stclib_LexRuby.o \
 	stclib_LexSQL.o \
+	stclib_LexSmalltalk.o \
+	stclib_LexTADS3.o \
 	stclib_LexScriptol.o \
 	stclib_LexSpecman.o \
+	stclib_LexSpice.o \
+	stclib_LexTCL.o \
 	stclib_LexTeX.o \
 	stclib_LexVB.o \
+	stclib_LexVHDL.o \
 	stclib_LexVerilog.o \
 	stclib_LexYAML.o \
 	stclib_LineMarker.o \
 	stclib_PropSet.o \
 	stclib_RESearch.o \
 	stclib_ScintillaBase.o \
-	stclib_StyleContext.o \
 	stclib_Style.o \
+	stclib_StyleContext.o \
 	stclib_UniConversion.o \
 	stclib_ViewStyle.o \
 	stclib_WindowAccessor.o \
@@ -204,7 +241,9 @@ STCLIB_OBJECTS =  \
 ### Conditionally set variables: ###
 
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
+@COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
+@COND_PLATFORM_MACOSX_1@	-compatibility_version 1.0 -current_version 1.0
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -227,25 +266,33 @@ STCLIB_OBJECTS =  \
 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)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_1 = --define wxNO_THREADS
 @COND_SHARED_1@__install_stcdll___depname = install_stcdll
+@COND_SHARED_1@__uninstall_stcdll___depname = uninstall_stcdll
 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-$(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-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib)
+COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
+	-Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).3
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@	= .$(SO_SUFFIX).0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .3.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.$(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).3.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__stcdll___targetsuf3 \
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	= \
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@	.$(SO_SUFFIX).0.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .3.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@	= -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)
@@ -273,9 +320,13 @@ COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
 	$(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_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
+@COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -307,7 +358,11 @@ COND_SHARED_0___stclib___depname = \
 	$(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_SHARED_0@__uninstall_stclib___depname = uninstall_stclib
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
 
 ### Targets: ###
 
@@ -322,7 +377,10 @@ install: all $(__install_stcdll___depname) $(__install_stclib___depname)
 	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
 	done
 
-uninstall: 
+uninstall: $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname)
+	for f in wx/stc/stc.h; do \
+	rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+	done
 
 install-strip: install
 	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
@@ -336,10 +394,10 @@ clean:
 	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
+	rm -f 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_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
+@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 @COND_SHARED_1@	
 @COND_SHARED_1@	$(__stcdll___so_symlinks_cmd)
 
@@ -349,431 +407,532 @@ distclean: clean
 @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_1@uninstall_stcdll: 
+@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_SHARED_1@	rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+@COND_SHARED_1@	(cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_uninst_cmd))
+
 @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@	$(AR) $(AROPTIONS) $@ $(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-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
 
+@COND_SHARED_0@uninstall_stclib: 
+@COND_SHARED_0@	rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
+stcdll_version_rc.o: $(srcdir)/../../../src/msw/version.rc
+	$(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1)  $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+
 stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/PlatWX.cpp
 
 stcdll_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/ScintillaWX.cpp
 
 stcdll_stc.o: $(srcdir)/stc.cpp
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/stc.cpp
 
 stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/AutoComplete.cxx
 
 stcdll_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CallTip.cxx
 
 stcdll_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CellBuffer.cxx
 
-stcdll_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_CharClassify.o: $(srcdir)/scintilla/src/CharClassify.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CharClassify.cxx
 
-stcdll_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ContractionState.cxx
 
 stcdll_Document.o: $(srcdir)/scintilla/src/Document.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Document.cxx
+
+stcdll_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/DocumentAccessor.cxx
 
 stcdll_Editor.o: $(srcdir)/scintilla/src/Editor.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Editor.cxx
 
 stcdll_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ExternalLexer.cxx
 
 stcdll_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Indicator.cxx
 
 stcdll_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/KeyMap.cxx
 
 stcdll_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/KeyWords.cxx
 
 stcdll_LexAPDL.o: $(srcdir)/scintilla/src/LexAPDL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAPDL.cxx
 
 stcdll_LexAU3.o: $(srcdir)/scintilla/src/LexAU3.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAU3.cxx
 
 stcdll_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAVE.cxx
 
 stcdll_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAda.cxx
 
 stcdll_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAsm.cxx
+
+stcdll_LexAsn1.o: $(srcdir)/scintilla/src/LexAsn1.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexAsn1.cxx
 
 stcdll_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBaan.cxx
 
 stcdll_LexBash.o: $(srcdir)/scintilla/src/LexBash.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBash.cxx
+
+stcdll_LexBasic.o: $(srcdir)/scintilla/src/LexBasic.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBasic.cxx
 
 stcdll_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexBullant.cxx
 
 stcdll_LexCLW.o: $(srcdir)/scintilla/src/LexCLW.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCLW.cxx
 
 stcdll_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCPP.cxx
 
 stcdll_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCSS.cxx
+
+stcdll_LexCaml.o: $(srcdir)/scintilla/src/LexCaml.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCaml.cxx
+
+stcdll_LexCsound.o: $(srcdir)/scintilla/src/LexCsound.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCsound.cxx
 
 stcdll_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexConf.cxx
 
 stcdll_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexCrontab.cxx
 
 stcdll_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexEScript.cxx
 
 stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexEiffel.cxx
 
 stcdll_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexErlang.cxx
+
+stcdll_LexFlagship.o: $(srcdir)/scintilla/src/LexFlagship.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexFlagship.cxx
 
 stcdll_LexForth.o: $(srcdir)/scintilla/src/LexForth.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexForth.cxx
 
 stcdll_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexFortran.cxx
 
 stcdll_LexGui4Cli.o: $(srcdir)/scintilla/src/LexGui4Cli.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexGui4Cli.cxx
 
 stcdll_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexHTML.cxx
+
+stcdll_LexHaskell.o: $(srcdir)/scintilla/src/LexHaskell.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexHaskell.cxx
+
+stcdll_LexInno.o: $(srcdir)/scintilla/src/LexInno.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexInno.cxx
 
 stcdll_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexKix.cxx
 
 stcdll_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexLisp.cxx
 
 stcdll_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexLout.cxx
 
 stcdll_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexLua.cxx
 
 stcdll_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMMIXAL.cxx
 
 stcdll_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMPT.cxx
 
 stcdll_LexMSSQL.o: $(srcdir)/scintilla/src/LexMSSQL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMSSQL.cxx
 
 stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMatlab.cxx
 
 stcdll_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexMetapost.cxx
 
 stcdll_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexNsis.cxx
+
+stcdll_LexOpal.o: $(srcdir)/scintilla/src/LexOpal.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexOpal.cxx
 
 stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexOthers.cxx
 
 stcdll_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPB.cxx
 
 stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPOV.cxx
 
 stcdll_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPS.cxx
 
 stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPascal.cxx
 
 stcdll_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPerl.cxx
 
 stcdll_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexPython.cxx
+
+stcdll_LexRebol.o: $(srcdir)/scintilla/src/LexRebol.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexRebol.cxx
 
 stcdll_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexRuby.cxx
 
 stcdll_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSQL.cxx
+
+stcdll_LexSmalltalk.o: $(srcdir)/scintilla/src/LexSmalltalk.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSmalltalk.cxx
+
+stcdll_LexTADS3.o: $(srcdir)/scintilla/src/LexTADS3.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTADS3.cxx
 
 stcdll_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexScriptol.cxx
 
 stcdll_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSpecman.cxx
+
+stcdll_LexSpice.o: $(srcdir)/scintilla/src/LexSpice.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSpice.cxx
+
+stcdll_LexTCL.o: $(srcdir)/scintilla/src/LexTCL.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTCL.cxx
 
 stcdll_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTeX.cxx
 
 stcdll_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexVB.cxx
+
+stcdll_LexVHDL.o: $(srcdir)/scintilla/src/LexVHDL.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexVHDL.cxx
 
 stcdll_LexVerilog.o: $(srcdir)/scintilla/src/LexVerilog.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexVerilog.cxx
 
 stcdll_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexYAML.cxx
 
 stcdll_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LineMarker.cxx
 
 stcdll_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/PropSet.cxx
 
 stcdll_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/RESearch.cxx
 
 stcdll_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
-
-stcdll_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ScintillaBase.cxx
 
 stcdll_Style.o: $(srcdir)/scintilla/src/Style.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/Style.cxx
+
+stcdll_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/StyleContext.cxx
 
 stcdll_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/UniConversion.cxx
 
 stcdll_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ViewStyle.cxx
 
 stcdll_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/WindowAccessor.cxx
 
 stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
-	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/XPM.cxx
 
 stclib_PlatWX.o: $(srcdir)/PlatWX.cpp
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/PlatWX.cpp
 
 stclib_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/ScintillaWX.cpp
 
 stclib_stc.o: $(srcdir)/stc.cpp
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/stc.cpp
 
 stclib_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/AutoComplete.cxx
 
 stclib_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CallTip.cxx
 
 stclib_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CellBuffer.cxx
 
-stclib_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_CharClassify.o: $(srcdir)/scintilla/src/CharClassify.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CharClassify.cxx
 
-stclib_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ContractionState.cxx
 
 stclib_Document.o: $(srcdir)/scintilla/src/Document.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Document.cxx
+
+stclib_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/DocumentAccessor.cxx
 
 stclib_Editor.o: $(srcdir)/scintilla/src/Editor.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Editor.cxx
 
 stclib_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ExternalLexer.cxx
 
 stclib_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Indicator.cxx
 
 stclib_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/KeyMap.cxx
 
 stclib_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/KeyWords.cxx
 
 stclib_LexAPDL.o: $(srcdir)/scintilla/src/LexAPDL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAPDL.cxx
 
 stclib_LexAU3.o: $(srcdir)/scintilla/src/LexAU3.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAU3.cxx
 
 stclib_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAVE.cxx
 
 stclib_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAda.cxx
 
 stclib_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAsm.cxx
+
+stclib_LexAsn1.o: $(srcdir)/scintilla/src/LexAsn1.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexAsn1.cxx
 
 stclib_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBaan.cxx
 
 stclib_LexBash.o: $(srcdir)/scintilla/src/LexBash.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBash.cxx
+
+stclib_LexBasic.o: $(srcdir)/scintilla/src/LexBasic.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBasic.cxx
 
 stclib_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexBullant.cxx
 
 stclib_LexCLW.o: $(srcdir)/scintilla/src/LexCLW.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCLW.cxx
 
 stclib_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCPP.cxx
 
 stclib_LexCSS.o: $(srcdir)/scintilla/src/LexCSS.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCSS.cxx
+
+stclib_LexCaml.o: $(srcdir)/scintilla/src/LexCaml.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCaml.cxx
+
+stclib_LexCsound.o: $(srcdir)/scintilla/src/LexCsound.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCsound.cxx
 
 stclib_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexConf.cxx
 
 stclib_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexCrontab.cxx
 
 stclib_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexEScript.cxx
 
 stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexEiffel.cxx
 
 stclib_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexErlang.cxx
+
+stclib_LexFlagship.o: $(srcdir)/scintilla/src/LexFlagship.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexFlagship.cxx
 
 stclib_LexForth.o: $(srcdir)/scintilla/src/LexForth.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexForth.cxx
 
 stclib_LexFortran.o: $(srcdir)/scintilla/src/LexFortran.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexFortran.cxx
 
 stclib_LexGui4Cli.o: $(srcdir)/scintilla/src/LexGui4Cli.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexGui4Cli.cxx
 
 stclib_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexHTML.cxx
+
+stclib_LexHaskell.o: $(srcdir)/scintilla/src/LexHaskell.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexHaskell.cxx
+
+stclib_LexInno.o: $(srcdir)/scintilla/src/LexInno.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexInno.cxx
 
 stclib_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexKix.cxx
 
 stclib_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexLisp.cxx
 
 stclib_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexLout.cxx
 
 stclib_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexLua.cxx
 
 stclib_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMMIXAL.cxx
 
 stclib_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMPT.cxx
 
 stclib_LexMSSQL.o: $(srcdir)/scintilla/src/LexMSSQL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMSSQL.cxx
 
 stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMatlab.cxx
 
 stclib_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexMetapost.cxx
 
 stclib_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexNsis.cxx
+
+stclib_LexOpal.o: $(srcdir)/scintilla/src/LexOpal.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexOpal.cxx
 
 stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexOthers.cxx
 
 stclib_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPB.cxx
 
 stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPOV.cxx
 
 stclib_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPS.cxx
 
 stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPascal.cxx
 
 stclib_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPerl.cxx
 
 stclib_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexPython.cxx
+
+stclib_LexRebol.o: $(srcdir)/scintilla/src/LexRebol.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexRebol.cxx
 
 stclib_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexRuby.cxx
 
 stclib_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSQL.cxx
+
+stclib_LexSmalltalk.o: $(srcdir)/scintilla/src/LexSmalltalk.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSmalltalk.cxx
+
+stclib_LexTADS3.o: $(srcdir)/scintilla/src/LexTADS3.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTADS3.cxx
 
 stclib_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexScriptol.cxx
 
 stclib_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSpecman.cxx
+
+stclib_LexSpice.o: $(srcdir)/scintilla/src/LexSpice.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSpice.cxx
+
+stclib_LexTCL.o: $(srcdir)/scintilla/src/LexTCL.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTCL.cxx
 
 stclib_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTeX.cxx
 
 stclib_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexVB.cxx
+
+stclib_LexVHDL.o: $(srcdir)/scintilla/src/LexVHDL.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexVHDL.cxx
 
 stclib_LexVerilog.o: $(srcdir)/scintilla/src/LexVerilog.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexVerilog.cxx
 
 stclib_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexYAML.cxx
 
 stclib_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LineMarker.cxx
 
 stclib_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/PropSet.cxx
 
 stclib_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/RESearch.cxx
 
 stclib_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
-stclib_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ScintillaBase.cxx
 
 stclib_Style.o: $(srcdir)/scintilla/src/Style.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/Style.cxx
+
+stclib_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/StyleContext.cxx
 
 stclib_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/UniConversion.cxx
 
 stclib_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ViewStyle.cxx
 
 stclib_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/WindowAccessor.cxx
 
 stclib_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
-	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/XPM.cxx
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all install uninstall clean distclean install_stcdll install_stclib
+.PHONY: all install uninstall clean distclean install_stcdll uninstall_stcdll install_stclib uninstall_stclib