X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f60bac1ab18be00b4e433f5db7b0261c5f17da..8f8e45c4d941c9b17a77ec71595e3d7a39058234:/src/stc/Makefile.in

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index b60d1e622b..e0f0d7447e 100644
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -10,39 +10,45 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
-AR = @AR@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-HOST_SUFFIX = @HOST_SUFFIX@
-LDFLAGS = @LDFLAGS@
+SHARED_LD_CXX = @SHARED_LD_CXX@
+LIBPREFIX = @LIBPREFIX@
+SO_SUFFIX = @SO_SUFFIX@
 LN_S = @LN_S@
 PIC_FLAG = @PIC_FLAG@
-RANLIB = @RANLIB@
-SHARED_LD_CXX = @SHARED_LD_CXX@
 SONAME_FLAG = @SONAME_FLAG@
-SO_SUFFIX = @SO_SUFFIX@
 STRIP = @STRIP@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DIR = @INSTALL_DIR@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+libdir = @libdir@
+includedir = @includedir@
+DLLPREFIX = @DLLPREFIX@
+AR = @AR@
+RANLIB = @RANLIB@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+VENDOR = @VENDOR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-VENDOR = @VENDOR@
-includedir = @includedir@
-libdir = @libdir@
-srcdir = @srcdir@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###
 
+DESTDIR = 
+WX_VERSION = 2.5.1
 LIBDIRNAME = $(top_builddir)lib
-STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include -I$(srcdir)/../../include \
-	-I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \
-	-DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL -DWXMAKINGDLL_STC $(CXXFLAGS) \
-	$(PIC_FLAG)
+STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_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_PlatWX.o \
 	stcdll_ScintillaWX.o \
@@ -51,52 +57,64 @@ STCDLL_OBJECTS =  \
 	stcdll_CallTip.o \
 	stcdll_CellBuffer.o \
 	stcdll_ContractionState.o \
-	stcdll_Document.o \
 	stcdll_DocumentAccessor.o \
+	stcdll_Document.o \
 	stcdll_Editor.o \
 	stcdll_ExternalLexer.o \
 	stcdll_Indicator.o \
 	stcdll_KeyMap.o \
 	stcdll_KeyWords.o \
-	stcdll_LexAVE.o \
 	stcdll_LexAda.o \
 	stcdll_LexAsm.o \
+	stcdll_LexAVE.o \
 	stcdll_LexBaan.o \
 	stcdll_LexBullant.o \
-	stcdll_LexCPP.o \
-	stcdll_LexCSS.o \
+	stcdll_LexCLW.o \
 	stcdll_LexConf.o \
+	stcdll_LexCPP.o \
 	stcdll_LexCrontab.o \
+	stcdll_LexCSS.o \
 	stcdll_LexEiffel.o \
+	stcdll_LexErlang.o \
 	stcdll_LexEScript.o \
+	stcdll_LexForth.o \
 	stcdll_LexFortran.o \
 	stcdll_LexHTML.o \
 	stcdll_LexLisp.o \
 	stcdll_LexLout.o \
 	stcdll_LexLua.o \
 	stcdll_LexMatlab.o \
+	stcdll_LexMetapost.o \
+	stcdll_LexMMIXAL.o \
+	stcdll_LexMPT.o \
+	stcdll_LexNsis.o \
 	stcdll_LexOthers.o \
-	stcdll_LexPOV.o \
 	stcdll_LexPascal.o \
+	stcdll_LexPB.o \
 	stcdll_LexPerl.o \
+	stcdll_LexPOV.o \
+	stcdll_LexPS.o \
 	stcdll_LexPython.o \
 	stcdll_LexRuby.o \
+	stcdll_LexScriptol.o \
 	stcdll_LexSQL.o \
+	stcdll_LexTeX.o \
 	stcdll_LexVB.o \
+	stcdll_LexYAML.o \
 	stcdll_LineMarker.o \
 	stcdll_PropSet.o \
 	stcdll_RESearch.o \
 	stcdll_ScintillaBase.o \
-	stcdll_Style.o \
 	stcdll_StyleContext.o \
+	stcdll_Style.o \
 	stcdll_UniConversion.o \
 	stcdll_ViewStyle.o \
 	stcdll_WindowAccessor.o \
 	stcdll_XPM.o
-STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include -I$(srcdir)/../../include \
-	-I$(srcdir)/scintilla/include -I$(srcdir)/scintilla/src -D__WX__ \
-	-DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS)
+STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(srcdir)/../../include -I$(srcdir)/scintilla/include \
+	-I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \
+	$(CXXFLAGS)
 STCLIB_OBJECTS =  \
 	stclib_PlatWX.o \
 	stclib_ScintillaWX.o \
@@ -105,490 +123,578 @@ STCLIB_OBJECTS =  \
 	stclib_CallTip.o \
 	stclib_CellBuffer.o \
 	stclib_ContractionState.o \
-	stclib_Document.o \
 	stclib_DocumentAccessor.o \
+	stclib_Document.o \
 	stclib_Editor.o \
 	stclib_ExternalLexer.o \
 	stclib_Indicator.o \
 	stclib_KeyMap.o \
 	stclib_KeyWords.o \
-	stclib_LexAVE.o \
 	stclib_LexAda.o \
 	stclib_LexAsm.o \
+	stclib_LexAVE.o \
 	stclib_LexBaan.o \
 	stclib_LexBullant.o \
-	stclib_LexCPP.o \
-	stclib_LexCSS.o \
+	stclib_LexCLW.o \
 	stclib_LexConf.o \
+	stclib_LexCPP.o \
 	stclib_LexCrontab.o \
+	stclib_LexCSS.o \
 	stclib_LexEiffel.o \
+	stclib_LexErlang.o \
 	stclib_LexEScript.o \
+	stclib_LexForth.o \
 	stclib_LexFortran.o \
 	stclib_LexHTML.o \
 	stclib_LexLisp.o \
 	stclib_LexLout.o \
 	stclib_LexLua.o \
 	stclib_LexMatlab.o \
+	stclib_LexMetapost.o \
+	stclib_LexMMIXAL.o \
+	stclib_LexMPT.o \
+	stclib_LexNsis.o \
 	stclib_LexOthers.o \
-	stclib_LexPOV.o \
 	stclib_LexPascal.o \
+	stclib_LexPB.o \
 	stclib_LexPerl.o \
+	stclib_LexPOV.o \
+	stclib_LexPS.o \
 	stclib_LexPython.o \
 	stclib_LexRuby.o \
+	stclib_LexScriptol.o \
 	stclib_LexSQL.o \
+	stclib_LexTeX.o \
 	stclib_LexVB.o \
+	stclib_LexYAML.o \
 	stclib_LineMarker.o \
 	stclib_PropSet.o \
 	stclib_RESearch.o \
 	stclib_ScintillaBase.o \
-	stclib_Style.o \
 	stclib_StyleContext.o \
+	stclib_Style.o \
 	stclib_UniConversion.o \
 	stclib_ViewStyle.o \
 	stclib_WindowAccessor.o \
 	stclib_XPM.o
-WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
+@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
+@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
+@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@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)250
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251
 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_SHARED_1@__install_stcdll___depname = install_stcdll
-@COND_SHARED_0@__install_stclib___depname = install_stclib
 COND_SHARED_1___stcdll___depname = \
-	$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
 @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname)
-COND_PLATFORM_WIN32_1___stcdll___importlib = \
-	-Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
-@COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib)
+@COND_SHARED_1@__install_stcdll___depname = install_stcdll
 COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \
-	$(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
+	$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd)
-@COND_PLATFORM_MACOSX_1@__stcdll___macver = \
-@COND_PLATFORM_MACOSX_1@	-compatibility_version $(WX_VERSION) \
-@COND_PLATFORM_MACOSX_1@	-current_version $(WX_VERSION)
+COND_PLATFORM_WIN32_1___stcdll___importlib = \
+	-Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@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).1
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf2 \
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .1.$(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).1.0.0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .1.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)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags)
+COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \
+	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_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 \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX))
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT))
 @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 \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd)
-COND_USE_SOVERLINUX_1___stcdll___soname_flags = \
-	$(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \
-	$(SONAME_FLAG)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags)
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@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@	= .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).0.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX)
+@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)-2.5$(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@	= \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
+@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
+@COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 COND_SHARED_0___stclib___depname = \
-	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a
+	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a
 @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__
 
 ### Targets: ###
 
 all: $(__stcdll___depname) $(__stclib___depname)
 
+install: all $(__install_stcdll___depname) $(__install_stclib___depname)
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)
+	for f in wx/stc/stc.h; do \
+	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
+	fi; \
+	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
+	done
+
+uninstall: 
+
+install-strip: install
+	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+
 clean: 
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
-	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
-	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
-	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a
+	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a
 
 distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
-install: all $(__install_stcdll___depname) $(__install_stclib___depname)
-	$(INSTALL) -d $(includedir)
-	for f in wx/stc/stc.h; do \
-	if test ! -d $(includedir)/`dirname $$f` ; then \
-	$(INSTALL) -d $(includedir)/`dirname $$f`; \
-	fi; \
-	$(INSTALL) -m 644 $(srcdir)/../../include//$$f $(includedir)/$$f; \
-	done
-
-install-strip: install
-	$(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_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@	
+@COND_SHARED_1@	$(__stcdll___so_symlinks_cmd)
 
 @COND_SHARED_1@install_stcdll: 
-@COND_SHARED_1@	$(INSTALL) -d $(libdir)
-@COND_SHARED_1@	$(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir)
-@COND_SHARED_1@	install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir)
-@COND_SHARED_1@	(cd $(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
+@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_1@	$(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_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)_stc-2.5$(HOST_SUFFIX).a: $(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) -d $(libdir)
-@COND_SHARED_0@	$(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
-@COND_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_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@	$(__stcdll___so_symlinks_cmd)
+stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_stc.o: $(srcdir)/stc.cpp
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
-
-stcdll_Document.o: $(srcdir)/scintilla/src/Document.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_Document.o: $(srcdir)/scintilla/src/Document.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_Editor.o: $(srcdir)/scintilla/src/Editor.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
-
-stcdll_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(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
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(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
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
-	$(CXX) -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
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(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
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
+
+stcdll_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_PlatWX.o: $(srcdir)/PlatWX.cpp
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stcdll_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_Style.o: $(srcdir)/scintilla/src/Style.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
-
-stcdll_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
 stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $<
 
-stcdll_stc.o: $(srcdir)/stc.cpp
-	$(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $<
+stclib_PlatWX.o: $(srcdir)/PlatWX.cpp
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: $(STCLIB_OBJECTS)
-@COND_SHARED_0@	rm -f $@
-@COND_SHARED_0@	$(AR) rcu $@ $(STCLIB_OBJECTS)
-@COND_SHARED_0@	$(RANLIB) $@
+stclib_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_stc.o: $(srcdir)/stc.cpp
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
-stclib_Document.o: $(srcdir)/scintilla/src/Document.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_DocumentAccessor.o: $(srcdir)/scintilla/src/DocumentAccessor.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_Document.o: $(srcdir)/scintilla/src/Document.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_Editor.o: $(srcdir)/scintilla/src/Editor.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_ExternalLexer.o: $(srcdir)/scintilla/src/ExternalLexer.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_Indicator.o: $(srcdir)/scintilla/src/Indicator.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_KeyMap.o: $(srcdir)/scintilla/src/KeyMap.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_KeyWords.o: $(srcdir)/scintilla/src/KeyWords.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
-stclib_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexAda.o: $(srcdir)/scintilla/src/LexAda.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexAsm.o: $(srcdir)/scintilla/src/LexAsm.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexAVE.o: $(srcdir)/scintilla/src/LexAVE.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexBaan.o: $(srcdir)/scintilla/src/LexBaan.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexBullant.o: $(srcdir)/scintilla/src/LexBullant.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(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
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexCPP.o: $(srcdir)/scintilla/src/LexCPP.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(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
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexConf.o: $(srcdir)/scintilla/src/LexConf.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexCrontab.o: $(srcdir)/scintilla/src/LexCrontab.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_LexErlang.o: $(srcdir)/scintilla/src/LexErlang.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexEScript.o: $(srcdir)/scintilla/src/LexEScript.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexEiffel.o: $(srcdir)/scintilla/src/LexEiffel.cxx
-	$(CXX) -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
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexLisp.o: $(srcdir)/scintilla/src/LexLisp.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexMPT.o: $(srcdir)/scintilla/src/LexMPT.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexPB.o: $(srcdir)/scintilla/src/LexPB.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexPerl.o: $(srcdir)/scintilla/src/LexPerl.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexPython.o: $(srcdir)/scintilla/src/LexPython.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(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
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
+
+stclib_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_LexYAML.o: $(srcdir)/scintilla/src/LexYAML.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_PlatWX.o: $(srcdir)/PlatWX.cpp
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_LineMarker.o: $(srcdir)/scintilla/src/LineMarker.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_PropSet.o: $(srcdir)/scintilla/src/PropSet.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_RESearch.o: $(srcdir)/scintilla/src/RESearch.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_ScintillaBase.o: $(srcdir)/scintilla/src/ScintillaBase.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
-stclib_ScintillaWX.o: $(srcdir)/ScintillaWX.cpp
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+stclib_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_Style.o: $(srcdir)/scintilla/src/Style.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
-stclib_StyleContext.o: $(srcdir)/scintilla/src/StyleContext.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_UniConversion.o: $(srcdir)/scintilla/src/UniConversion.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_ViewStyle.o: $(srcdir)/scintilla/src/ViewStyle.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_WindowAccessor.o: $(srcdir)/scintilla/src/WindowAccessor.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 stclib_XPM.o: $(srcdir)/scintilla/src/XPM.cxx
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
-stclib_stc.o: $(srcdir)/stc.cpp
-	$(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $<
-
-uninstall: 
+	$(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install install_stcdll install_stclib uninstall
+.PHONY: all install uninstall clean distclean install_stcdll install_stclib