diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index df5dc879a0..acd43d1e67 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -944,7 +944,7 @@ dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[wx.bkl] ###
         COND_USE_SOVERSOLARIS_1=""
     fi
     AC_SUBST(COND_USE_SOVERSOLARIS_1)
-dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
+dnl ### begin block 20_COND_USE_STC_1[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
     COND_USE_STC_1="#"
     if test "x$USE_STC" = "x1" ; then
         COND_USE_STC_1=""
diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index bb8097ad1e..78570d597f 100644
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/Makefile.in
@@ -114,11 +114,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/demos/bombs/makefile.gcc b/demos/bombs/makefile.gcc
index eca800e737..43a748084c 100644
--- a/demos/bombs/makefile.gcc
+++ b/demos/bombs/makefile.gcc
@@ -148,9 +148,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/demos/bombs/makefile.vc b/demos/bombs/makefile.vc
index bf20079e0a..6e9a8d1f22 100644
--- a/demos/bombs/makefile.vc
+++ b/demos/bombs/makefile.vc
@@ -377,7 +377,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in
index 20925a6444..cb4f1c8526 100644
--- a/demos/forty/Makefile.in
+++ b/demos/forty/Makefile.in
@@ -126,11 +126,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/demos/forty/makefile.gcc b/demos/forty/makefile.gcc
index 8432259dcf..151aa814eb 100644
--- a/demos/forty/makefile.gcc
+++ b/demos/forty/makefile.gcc
@@ -161,9 +161,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/demos/forty/makefile.vc b/demos/forty/makefile.vc
index 1c3d885540..56fd447c9f 100644
--- a/demos/forty/makefile.vc
+++ b/demos/forty/makefile.vc
@@ -390,7 +390,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in
index 97ba726ddc..b295410328 100644
--- a/demos/fractal/Makefile.in
+++ b/demos/fractal/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/demos/fractal/makefile.gcc b/demos/fractal/makefile.gcc
index ef23eaef10..1007097fba 100644
--- a/demos/fractal/makefile.gcc
+++ b/demos/fractal/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/demos/fractal/makefile.vc b/demos/fractal/makefile.vc
index 4d6cbb8396..d4205d090e 100644
--- a/demos/fractal/makefile.vc
+++ b/demos/fractal/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index f2945075e4..978aa755ec 100644
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -115,11 +115,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/demos/life/makefile.gcc b/demos/life/makefile.gcc
index 982e869674..03738f2b26 100644
--- a/demos/life/makefile.gcc
+++ b/demos/life/makefile.gcc
@@ -149,9 +149,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc
index 218c3b6f3d..a00a1b15e1 100644
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -378,7 +378,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in
index a45177122d..172c545103 100644
--- a/demos/poem/Makefile.in
+++ b/demos/poem/Makefile.in
@@ -116,11 +116,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc
index d8b10616a3..4df8eb136d 100644
--- a/demos/poem/makefile.gcc
+++ b/demos/poem/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc
index ff81588864..c2121a0c2e 100644
--- a/demos/poem/makefile.vc
+++ b/demos/poem/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/access/Makefile.in b/samples/access/Makefile.in
index a2afaae971..cbcda31fa4 100644
--- a/samples/access/Makefile.in
+++ b/samples/access/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index c061068621..05d94ec076 100644
--- a/samples/access/makefile.gcc
+++ b/samples/access/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/access/makefile.vc b/samples/access/makefile.vc
index 297e476b02..21d3bb7c07 100644
--- a/samples/access/makefile.vc
+++ b/samples/access/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in
index 277ef69acb..4c6e2d795e 100644
--- a/samples/animate/Makefile.in
+++ b/samples/animate/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/animate/makefile.gcc b/samples/animate/makefile.gcc
index f8bfac9b4a..89db9a5732 100644
--- a/samples/animate/makefile.gcc
+++ b/samples/animate/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/animate/makefile.vc b/samples/animate/makefile.vc
index ae2ef3d3bc..927e1a9884 100644
--- a/samples/animate/makefile.vc
+++ b/samples/animate/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in
index 4c96106473..bdcd871987 100644
--- a/samples/artprov/Makefile.in
+++ b/samples/artprov/Makefile.in
@@ -113,11 +113,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index ab1cfae825..5c73172f07 100644
--- a/samples/artprov/makefile.gcc
+++ b/samples/artprov/makefile.gcc
@@ -147,9 +147,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/artprov/makefile.vc b/samples/artprov/makefile.vc
index ecc8748840..7e8912f6dd 100644
--- a/samples/artprov/makefile.vc
+++ b/samples/artprov/makefile.vc
@@ -376,7 +376,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in
index 4af4ad52f6..4b8c202ecb 100644
--- a/samples/aui/Makefile.in
+++ b/samples/aui/Makefile.in
@@ -122,11 +122,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/aui/makefile.gcc b/samples/aui/makefile.gcc
index 01abfdee3a..0c244e8c27 100644
--- a/samples/aui/makefile.gcc
+++ b/samples/aui/makefile.gcc
@@ -158,9 +158,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/aui/makefile.vc b/samples/aui/makefile.vc
index 1c8b9dd118..cc17c42ea5 100644
--- a/samples/aui/makefile.vc
+++ b/samples/aui/makefile.vc
@@ -387,7 +387,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in
index f4ead06fea..28d77f9488 100644
--- a/samples/calendar/Makefile.in
+++ b/samples/calendar/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/calendar/makefile.gcc b/samples/calendar/makefile.gcc
index d75eedc184..cea01e3e8a 100644
--- a/samples/calendar/makefile.gcc
+++ b/samples/calendar/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/calendar/makefile.vc b/samples/calendar/makefile.vc
index d570726614..cc84065b32 100644
--- a/samples/calendar/makefile.vc
+++ b/samples/calendar/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in
index e1b0ad73c1..c47fad3ebc 100644
--- a/samples/caret/Makefile.in
+++ b/samples/caret/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/caret/makefile.gcc b/samples/caret/makefile.gcc
index 81191e9b1f..7b7134707c 100644
--- a/samples/caret/makefile.gcc
+++ b/samples/caret/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/caret/makefile.vc b/samples/caret/makefile.vc
index fd626bb598..7be107817e 100644
--- a/samples/caret/makefile.vc
+++ b/samples/caret/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in
index f7ba611d38..2b41dabfe6 100644
--- a/samples/clipboard/Makefile.in
+++ b/samples/clipboard/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/clipboard/makefile.gcc b/samples/clipboard/makefile.gcc
index 92e590cd58..be9fe8b9bd 100644
--- a/samples/clipboard/makefile.gcc
+++ b/samples/clipboard/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/clipboard/makefile.vc b/samples/clipboard/makefile.vc
index 6b6b28ad78..61ee2e1bba 100644
--- a/samples/clipboard/makefile.vc
+++ b/samples/clipboard/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in
index 304bcb9d4e..2059578ab3 100644
--- a/samples/collpane/Makefile.in
+++ b/samples/collpane/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/collpane/makefile.gcc b/samples/collpane/makefile.gcc
index beb24c199d..827b7d44c6 100644
--- a/samples/collpane/makefile.gcc
+++ b/samples/collpane/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/collpane/makefile.vc b/samples/collpane/makefile.vc
index 7ba54131f0..ce664815da 100644
--- a/samples/collpane/makefile.vc
+++ b/samples/collpane/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in
index 684df7d0fa..d8504e70f8 100644
--- a/samples/combo/Makefile.in
+++ b/samples/combo/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/combo/makefile.gcc b/samples/combo/makefile.gcc
index 10cf2a52c3..e8405e7cba 100644
--- a/samples/combo/makefile.gcc
+++ b/samples/combo/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/combo/makefile.vc b/samples/combo/makefile.vc
index 44819b0e29..d9717a4d61 100644
--- a/samples/combo/makefile.vc
+++ b/samples/combo/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in
index ea4cdd516a..123fb1fe5e 100644
--- a/samples/config/Makefile.in
+++ b/samples/config/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/config/makefile.gcc b/samples/config/makefile.gcc
index 107ad39580..0725339458 100644
--- a/samples/config/makefile.gcc
+++ b/samples/config/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/config/makefile.vc b/samples/config/makefile.vc
index fd9bc82e34..47955e4d0f 100644
--- a/samples/config/makefile.vc
+++ b/samples/config/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in
index f760ba1dbe..7020e2a347 100644
--- a/samples/dataview/Makefile.in
+++ b/samples/dataview/Makefile.in
@@ -113,11 +113,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/dataview/makefile.gcc b/samples/dataview/makefile.gcc
index e9468a0d0e..09d652c60a 100644
--- a/samples/dataview/makefile.gcc
+++ b/samples/dataview/makefile.gcc
@@ -147,9 +147,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/dataview/makefile.vc b/samples/dataview/makefile.vc
index 30fe8b900d..9d11b6b0d0 100644
--- a/samples/dataview/makefile.vc
+++ b/samples/dataview/makefile.vc
@@ -376,7 +376,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in
index 6f38173b5b..91d87380a6 100644
--- a/samples/debugrpt/Makefile.in
+++ b/samples/debugrpt/Makefile.in
@@ -118,11 +118,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/debugrpt/makefile.gcc b/samples/debugrpt/makefile.gcc
index e6760d9949..45bff41116 100644
--- a/samples/debugrpt/makefile.gcc
+++ b/samples/debugrpt/makefile.gcc
@@ -154,9 +154,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/debugrpt/makefile.vc b/samples/debugrpt/makefile.vc
index e2fbb8b5e6..a3f13c2806 100644
--- a/samples/debugrpt/makefile.vc
+++ b/samples/debugrpt/makefile.vc
@@ -383,7 +383,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in
index f3b105a71f..b30e083178 100644
--- a/samples/dialogs/Makefile.in
+++ b/samples/dialogs/Makefile.in
@@ -121,11 +121,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index 9445926623..bed66894af 100644
--- a/samples/dialogs/makefile.gcc
+++ b/samples/dialogs/makefile.gcc
@@ -156,9 +156,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index 2177b1fde1..e29f2aa9b5 100644
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -383,7 +383,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in
index e2a4cf33f2..aa0ad0295c 100644
--- a/samples/dialup/Makefile.in
+++ b/samples/dialup/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/dialup/makefile.gcc b/samples/dialup/makefile.gcc
index 87406dc5d0..dc01e62da9 100644
--- a/samples/dialup/makefile.gcc
+++ b/samples/dialup/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/dialup/makefile.vc b/samples/dialup/makefile.vc
index 984eaad530..88db313bac 100644
--- a/samples/dialup/makefile.vc
+++ b/samples/dialup/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in
index 98fc4046df..7baaaf074b 100644
--- a/samples/display/Makefile.in
+++ b/samples/display/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/display/makefile.gcc b/samples/display/makefile.gcc
index fcf89d801d..facece7fb0 100644
--- a/samples/display/makefile.gcc
+++ b/samples/display/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/display/makefile.vc b/samples/display/makefile.vc
index 3f6f0de05d..0d35594ac6 100644
--- a/samples/display/makefile.vc
+++ b/samples/display/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/dll/Makefile.in b/samples/dll/Makefile.in
index fb85b1c83a..77eb0ca6c3 100644
--- a/samples/dll/Makefile.in
+++ b/samples/dll/Makefile.in
@@ -88,6 +88,9 @@ SDK_EXE_OBJECTS =  \
 @COND_PLATFORM_OS2_1@	$(LIBPREFIX)my_dll.$(DLLIMP_SUFFIX)
 @COND_WINDOWS_IMPLIB_1@__my_dll___importlib = \
 @COND_WINDOWS_IMPLIB_1@	-Wl,--out-implib=$(LIBPREFIX)my_dll.$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 @COND_PLATFORM_WIN32_1_SHARED_0@__wx_exe___depname = wx_exe$(EXEEXT)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__
 @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0
@@ -119,6 +122,9 @@ COND_PLATFORM_OS2_1___wx_exe___os2_emxbindcmd = $(NM) wx_exe$(EXEEXT) | if grep
 @COND_TOOLKIT_OSX_IPHONE@	= $(__wx_exe_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____wx_exe_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@	$(__wx_exe_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
 @COND_PLATFORM_WIN32_1@__sdk_exe___depname = sdk_exe$(EXEEXT)
 COND_PLATFORM_OS2_1___sdk_exe___os2_emxbindcmd = $(NM) sdk_exe$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep sdk_exe$(EXEEXT) ; fi
@@ -138,12 +144,10 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -186,7 +190,7 @@ distclean: clean
 @COND_PLATFORM_WIN32_1@	$(SHARED_LD_CXX) $@ $(MY_DLL_OBJECTS)  $(__my_dll___importlib)   -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_PLATFORM_WIN32_1_SHARED_0@wx_exe$(EXEEXT): $(WX_EXE_OBJECTS) $(__wx_exe___win32rc) $(__my_dll___depname)
-@COND_PLATFORM_WIN32_1_SHARED_0@	$(CXX) -o $@ $(WX_EXE_OBJECTS) -L.    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lmy_dll $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_PLATFORM_WIN32_1_SHARED_0@	$(CXX) -o $@ $(WX_EXE_OBJECTS) -L.    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lmy_dll $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_PLATFORM_WIN32_1_SHARED_0@	$(__wx_exe___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0@wx_exe.app/Contents/PkgInfo: $(__wx_exe___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
diff --git a/samples/dll/makefile.gcc b/samples/dll/makefile.gcc
index aafffcd148..873392d699 100644
--- a/samples/dll/makefile.gcc
+++ b/samples/dll/makefile.gcc
@@ -74,6 +74,11 @@ endif
 ifeq ($(MONOLITHIC),1)
 EXTRALIBS_FOR_BASE =   
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(SHARED),0)
 __wx_exe___depname = $(OBJS)\wx_exe.exe
 endif
@@ -101,6 +106,11 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
@@ -141,10 +151,8 @@ ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
 endif
 endif
-ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
-endif
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -229,7 +237,7 @@ ifeq ($(SHARED),0)
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS) $(OBJS)\wx_exe_sample_rc.o $(OBJS)\my_dll.dll
 	$(foreach f,$(subst \,/,$(WX_EXE_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\libmy_dll.a $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 endif
 
diff --git a/samples/dll/makefile.vc b/samples/dll/makefile.vc
index 9064bd7b8a..5606ed23dc 100644
--- a/samples/dll/makefile.vc
+++ b/samples/dll/makefile.vc
@@ -199,6 +199,9 @@ __RUNTIME_LIBS_11 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_11 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
 !if "$(SHARED)" == "0"
 __wx_exe___depname = $(OBJS)\wx_exe.exe
 !endif
@@ -274,6 +277,9 @@ ____CAIRO_INCLUDEDIR_FILENAMES_3_p = /i $(CAIRO_ROOT)\include\cairo
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_3 = /d WXUSINGDLL
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_33 = $(__DEBUGRUNTIME_1)
 !endif
@@ -334,8 +340,8 @@ __WXLIB_MONO_p = \
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -484,7 +490,7 @@ $(OBJS)\my_dll.dll: $(MY_DLL_OBJECTS)
 !if "$(SHARED)" == "0"
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS) $(OBJS)\wx_exe_sample.res $(OBJS)\my_dll.dll
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO) /pdb:"$(OBJS)\wx_exe.pdb" $(__DEBUGINFO_17)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(WX_EXE_OBJECTS) $(WX_EXE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(WX_EXE_OBJECTS) $(WX_EXE_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in
index b0cb9b4af1..3f5a655471 100644
--- a/samples/dnd/Makefile.in
+++ b/samples/dnd/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/dnd/makefile.gcc b/samples/dnd/makefile.gcc
index 29fbc1eebe..f52c74e3c6 100644
--- a/samples/dnd/makefile.gcc
+++ b/samples/dnd/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/dnd/makefile.vc b/samples/dnd/makefile.vc
index 24170d33df..7ba31e1256 100644
--- a/samples/dnd/makefile.vc
+++ b/samples/dnd/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 1d319e5de4..5162088e30 100644
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/docview/makefile.gcc b/samples/docview/makefile.gcc
index 1bfb6fd51f..86cdcad3bf 100644
--- a/samples/docview/makefile.gcc
+++ b/samples/docview/makefile.gcc
@@ -152,9 +152,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/docview/makefile.vc b/samples/docview/makefile.vc
index 5bf98859a9..2fca2cd923 100644
--- a/samples/docview/makefile.vc
+++ b/samples/docview/makefile.vc
@@ -381,7 +381,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index 2f5814d2c9..11aeaf355b 100644
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/dragimag/makefile.gcc b/samples/dragimag/makefile.gcc
index c511bab7a1..66f266e7b2 100644
--- a/samples/dragimag/makefile.gcc
+++ b/samples/dragimag/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/dragimag/makefile.vc b/samples/dragimag/makefile.vc
index 255607b260..a244ceca67 100644
--- a/samples/dragimag/makefile.vc
+++ b/samples/dragimag/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in
index af43e148ab..65976dae47 100644
--- a/samples/drawing/Makefile.in
+++ b/samples/drawing/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/drawing/makefile.gcc b/samples/drawing/makefile.gcc
index c68269515f..26b9710947 100644
--- a/samples/drawing/makefile.gcc
+++ b/samples/drawing/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/drawing/makefile.vc b/samples/drawing/makefile.vc
index 4a1008892a..b669159bbe 100644
--- a/samples/drawing/makefile.vc
+++ b/samples/drawing/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in
index e26aa7d597..b88ffea1f7 100644
--- a/samples/erase/Makefile.in
+++ b/samples/erase/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/erase/makefile.gcc b/samples/erase/makefile.gcc
index d48b1c25cf..3f54af847a 100644
--- a/samples/erase/makefile.gcc
+++ b/samples/erase/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/erase/makefile.vc b/samples/erase/makefile.vc
index 2ded39faea..8aa93c02bb 100644
--- a/samples/erase/makefile.vc
+++ b/samples/erase/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in
index 6fbf780a94..6aeeaff82f 100644
--- a/samples/event/Makefile.in
+++ b/samples/event/Makefile.in
@@ -114,11 +114,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/event/makefile.gcc b/samples/event/makefile.gcc
index 54f4b11d27..d7169a70f2 100644
--- a/samples/event/makefile.gcc
+++ b/samples/event/makefile.gcc
@@ -148,9 +148,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/event/makefile.vc b/samples/event/makefile.vc
index 0ef574eec9..472a4f0345 100644
--- a/samples/event/makefile.vc
+++ b/samples/event/makefile.vc
@@ -377,7 +377,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in
index 2249079add..540fe6af9a 100644
--- a/samples/except/Makefile.in
+++ b/samples/except/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/except/makefile.gcc b/samples/except/makefile.gcc
index 2c554405b6..2641d435b3 100644
--- a/samples/except/makefile.gcc
+++ b/samples/except/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/except/makefile.vc b/samples/except/makefile.vc
index f6211d71cb..e2d752c7f7 100644
--- a/samples/except/makefile.vc
+++ b/samples/except/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in
index b9b551f95f..22950a0318 100644
--- a/samples/exec/Makefile.in
+++ b/samples/exec/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/exec/makefile.gcc b/samples/exec/makefile.gcc
index 615e5aec6f..8243256265 100644
--- a/samples/exec/makefile.gcc
+++ b/samples/exec/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/exec/makefile.vc b/samples/exec/makefile.vc
index 80790fe6b6..043e7ad64d 100644
--- a/samples/exec/makefile.vc
+++ b/samples/exec/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in
index 0f0d886ba8..a7c3bcfd0f 100644
--- a/samples/font/Makefile.in
+++ b/samples/font/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/font/makefile.gcc b/samples/font/makefile.gcc
index 31cd0f7e3a..ab56826f57 100644
--- a/samples/font/makefile.gcc
+++ b/samples/font/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/font/makefile.vc b/samples/font/makefile.vc
index 40ce6b15c8..a86f49d1cf 100644
--- a/samples/font/makefile.vc
+++ b/samples/font/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in
index 4baaa26034..3f819f6369 100644
--- a/samples/fswatcher/Makefile.in
+++ b/samples/fswatcher/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/fswatcher/makefile.gcc b/samples/fswatcher/makefile.gcc
index 4e5cb82902..39188aa63c 100644
--- a/samples/fswatcher/makefile.gcc
+++ b/samples/fswatcher/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc
index 7ed56df052..52843d75d2 100644
--- a/samples/fswatcher/makefile.vc
+++ b/samples/fswatcher/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in
index 10d96e6ff3..08e1903e6a 100644
--- a/samples/grid/Makefile.in
+++ b/samples/grid/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/grid/makefile.gcc b/samples/grid/makefile.gcc
index 12a1d58334..76a1e316e2 100644
--- a/samples/grid/makefile.gcc
+++ b/samples/grid/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/grid/makefile.vc b/samples/grid/makefile.vc
index 75f7e32917..e6a43f9d96 100644
--- a/samples/grid/makefile.vc
+++ b/samples/grid/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index 03fb89d408..2388397329 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -116,11 +116,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index c152906f8a..7d5b0abed2 100644
--- a/samples/help/makefile.gcc
+++ b/samples/help/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index da9fa81fda..bb3008ae70 100644
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in
index f9df494958..a4ead0b345 100644
--- a/samples/htlbox/Makefile.in
+++ b/samples/htlbox/Makefile.in
@@ -116,11 +116,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/htlbox/makefile.gcc b/samples/htlbox/makefile.gcc
index 9b0f63b749..92af226f2e 100644
--- a/samples/htlbox/makefile.gcc
+++ b/samples/htlbox/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/htlbox/makefile.vc b/samples/htlbox/makefile.vc
index 82a93de9cd..1bcd2217f1 100644
--- a/samples/htlbox/makefile.vc
+++ b/samples/htlbox/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in
index 8b3c0b3c7e..6dc4cd0086 100644
--- a/samples/html/about/Makefile.in
+++ b/samples/html/about/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/about/makefile.gcc b/samples/html/about/makefile.gcc
index eaeea65d5b..c9a145817e 100644
--- a/samples/html/about/makefile.gcc
+++ b/samples/html/about/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/about/makefile.vc b/samples/html/about/makefile.vc
index ad92b7f99f..1d54d78fe0 100644
--- a/samples/html/about/makefile.vc
+++ b/samples/html/about/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in
index 0973d00bc6..ec6a474c4a 100644
--- a/samples/html/help/Makefile.in
+++ b/samples/html/help/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/help/makefile.gcc b/samples/html/help/makefile.gcc
index ffb94ca2a6..85d5ed75b9 100644
--- a/samples/html/help/makefile.gcc
+++ b/samples/html/help/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/help/makefile.vc b/samples/html/help/makefile.vc
index 5fdbba9fbc..0033e34d6d 100644
--- a/samples/html/help/makefile.vc
+++ b/samples/html/help/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in
index 98e45b0896..ef72c62a57 100644
--- a/samples/html/helpview/Makefile.in
+++ b/samples/html/helpview/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/helpview/makefile.gcc b/samples/html/helpview/makefile.gcc
index fb052a3f7e..01bc5c9cf2 100644
--- a/samples/html/helpview/makefile.gcc
+++ b/samples/html/helpview/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/helpview/makefile.vc b/samples/html/helpview/makefile.vc
index ec0d076a1e..c7c20730de 100644
--- a/samples/html/helpview/makefile.vc
+++ b/samples/html/helpview/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in
index ab8cab67a8..9ea41df3ce 100644
--- a/samples/html/printing/Makefile.in
+++ b/samples/html/printing/Makefile.in
@@ -122,11 +122,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc
index 730a46ea1a..8a02bc9b8c 100644
--- a/samples/html/printing/makefile.gcc
+++ b/samples/html/printing/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc
index fec775d2e4..f1148458e9 100644
--- a/samples/html/printing/makefile.vc
+++ b/samples/html/printing/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/test/Makefile.in b/samples/html/test/Makefile.in
index 2ef45b30a3..24861a18c9 100644
--- a/samples/html/test/Makefile.in
+++ b/samples/html/test/Makefile.in
@@ -120,11 +120,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/test/makefile.gcc b/samples/html/test/makefile.gcc
index fa320f39c5..913cd664d6 100644
--- a/samples/html/test/makefile.gcc
+++ b/samples/html/test/makefile.gcc
@@ -154,9 +154,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/test/makefile.vc b/samples/html/test/makefile.vc
index 01e09a85af..c6fdcb9fdb 100644
--- a/samples/html/test/makefile.vc
+++ b/samples/html/test/makefile.vc
@@ -383,7 +383,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/virtual/Makefile.in b/samples/html/virtual/Makefile.in
index c0d3dc03d3..25d9e42534 100644
--- a/samples/html/virtual/Makefile.in
+++ b/samples/html/virtual/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/virtual/makefile.gcc b/samples/html/virtual/makefile.gcc
index 05d13ea06a..8abd6f07d1 100644
--- a/samples/html/virtual/makefile.gcc
+++ b/samples/html/virtual/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/virtual/makefile.vc b/samples/html/virtual/makefile.vc
index e86811ceed..23abc896d1 100644
--- a/samples/html/virtual/makefile.vc
+++ b/samples/html/virtual/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/widget/Makefile.in b/samples/html/widget/Makefile.in
index f9ce075506..cff640335c 100644
--- a/samples/html/widget/Makefile.in
+++ b/samples/html/widget/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/widget/makefile.gcc b/samples/html/widget/makefile.gcc
index e7e6bdfc38..7c51d768dc 100644
--- a/samples/html/widget/makefile.gcc
+++ b/samples/html/widget/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/widget/makefile.vc b/samples/html/widget/makefile.vc
index 18f93cb74f..5a4d6dde33 100644
--- a/samples/html/widget/makefile.vc
+++ b/samples/html/widget/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/html/zip/Makefile.in b/samples/html/zip/Makefile.in
index d19944be86..cca49af9d6 100644
--- a/samples/html/zip/Makefile.in
+++ b/samples/html/zip/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/html/zip/makefile.gcc b/samples/html/zip/makefile.gcc
index 09b1b60c1f..c32f4e703b 100644
--- a/samples/html/zip/makefile.gcc
+++ b/samples/html/zip/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/html/zip/makefile.vc b/samples/html/zip/makefile.vc
index 843bac4f32..304eb8977f 100644
--- a/samples/html/zip/makefile.vc
+++ b/samples/html/zip/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/image/Makefile.in b/samples/image/Makefile.in
index e17a947155..e17f007cb4 100644
--- a/samples/image/Makefile.in
+++ b/samples/image/Makefile.in
@@ -113,11 +113,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/image/makefile.gcc b/samples/image/makefile.gcc
index 350de5eeeb..af52fc28a1 100644
--- a/samples/image/makefile.gcc
+++ b/samples/image/makefile.gcc
@@ -147,9 +147,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/image/makefile.vc b/samples/image/makefile.vc
index e2af612e86..c38f7ff7d5 100644
--- a/samples/image/makefile.vc
+++ b/samples/image/makefile.vc
@@ -376,7 +376,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in
index 0af53eff34..2fbb6e2178 100644
--- a/samples/internat/Makefile.in
+++ b/samples/internat/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/internat/makefile.gcc b/samples/internat/makefile.gcc
index 123e185523..1f35a44b8a 100644
--- a/samples/internat/makefile.gcc
+++ b/samples/internat/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/internat/makefile.vc b/samples/internat/makefile.vc
index 8c281c6ebc..6f271be1fc 100644
--- a/samples/internat/makefile.vc
+++ b/samples/internat/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in
index a355857079..2fc9c6e51b 100644
--- a/samples/ipc/Makefile.in
+++ b/samples/ipc/Makefile.in
@@ -106,6 +106,9 @@ COND_PLATFORM_OS2_1___ipcclient___os2_emxbindcmd = $(NM) ipcclient$(EXEEXT) | \
 @COND_TOOLKIT_OSX_COCOA@	= $(__ipcclient_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____ipcclient_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__ipcclient_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 @COND_USE_GUI_1@__ipcserver___depname = ipcserver$(EXEEXT)
 COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
 	if grep -q pmwin.763 ; then emxbind -ep ipcserver$(EXEEXT) ; fi
@@ -125,6 +128,9 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
 @COND_TOOLKIT_OSX_COCOA@	= $(__ipcserver_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____ipcserver_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__ipcserver_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
 @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
 @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
@@ -141,12 +147,10 @@ COND_PLATFORM_OS2_1___ipcserver___os2_emxbindcmd = $(NM) ipcserver$(EXEEXT) | \
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -233,7 +237,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcclient_bundle: $(____ipcclient_BUNDLE_TGT_REF_DEP)
 
 @COND_USE_GUI_1@ipcserver$(EXEEXT): $(IPCSERVER_OBJECTS) $(__ipcserver___win32rc)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(IPCSERVER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(IPCSERVER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_USE_GUI_1@	$(__ipcserver___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@ipcserver.app/Contents/PkgInfo: $(__ipcserver___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
diff --git a/samples/ipc/makefile.gcc b/samples/ipc/makefile.gcc
index d38dddf3ef..34528f05df 100644
--- a/samples/ipc/makefile.gcc
+++ b/samples/ipc/makefile.gcc
@@ -90,10 +90,20 @@ endif
 ifeq ($(USE_GUI),1)
 __ipcclient___depname = $(OBJS)\ipcclient.exe
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(USE_GUI),1)
 __ipcserver___depname = $(OBJS)\ipcserver.exe
 endif
 ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+endif
+endif
+ifeq ($(MONOLITHIC),1)
 __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
 endif
 ifeq ($(MONOLITHIC),1)
@@ -132,10 +142,8 @@ ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
 endif
 endif
-ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
-endif
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -257,7 +265,7 @@ ifeq ($(USE_GUI),1)
 $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample_rc.o
 	$(foreach f,$(subst \,/,$(IPCSERVER_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 endif
 
diff --git a/samples/ipc/makefile.vc b/samples/ipc/makefile.vc
index 3269f34cad..d38e0f7153 100644
--- a/samples/ipc/makefile.vc
+++ b/samples/ipc/makefile.vc
@@ -220,6 +220,9 @@ __RUNTIME_LIBS_10 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_10 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
 !if "$(USE_GUI)" == "1"
 __ipcserver___depname = $(OBJS)\ipcserver.exe
 !endif
@@ -241,6 +244,9 @@ __RUNTIME_LIBS_26 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_26 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_34 = $(__DEBUGRUNTIME_2)
 !endif
@@ -344,8 +350,8 @@ __WXLIB_CORE_p = \
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -537,7 +543,7 @@ $(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res
 !if "$(USE_GUI)" == "1"
 $(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcserver.pdb" $(__DEBUGINFO_18)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(IPCSERVER_OBJECTS) $(IPCSERVER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(IPCSERVER_OBJECTS) $(IPCSERVER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in
index ac592c6227..8cfaa0fee6 100644
--- a/samples/joytest/Makefile.in
+++ b/samples/joytest/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/joytest/makefile.gcc b/samples/joytest/makefile.gcc
index 6b187eb15b..396f08de33 100644
--- a/samples/joytest/makefile.gcc
+++ b/samples/joytest/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/joytest/makefile.vc b/samples/joytest/makefile.vc
index 70012c4ceb..55133df6fb 100644
--- a/samples/joytest/makefile.vc
+++ b/samples/joytest/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in
index 2b719a4a0a..5ca4b29f8c 100644
--- a/samples/keyboard/Makefile.in
+++ b/samples/keyboard/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/keyboard/makefile.gcc b/samples/keyboard/makefile.gcc
index 73c087eceb..06b63e69a1 100644
--- a/samples/keyboard/makefile.gcc
+++ b/samples/keyboard/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/keyboard/makefile.vc b/samples/keyboard/makefile.vc
index df1a2652a3..edb76e9a67 100644
--- a/samples/keyboard/makefile.vc
+++ b/samples/keyboard/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index 0b9e2b00d6..c34df59f4b 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/layout/makefile.gcc b/samples/layout/makefile.gcc
index b4bdc5a8eb..dffa7c7a19 100644
--- a/samples/layout/makefile.gcc
+++ b/samples/layout/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/layout/makefile.vc b/samples/layout/makefile.vc
index fe1644acb6..84607c25af 100644
--- a/samples/layout/makefile.vc
+++ b/samples/layout/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in
index ea91b09662..05aa12ecaa 100644
--- a/samples/listctrl/Makefile.in
+++ b/samples/listctrl/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/listctrl/makefile.gcc b/samples/listctrl/makefile.gcc
index 3b2212053f..0ebf11fa64 100644
--- a/samples/listctrl/makefile.gcc
+++ b/samples/listctrl/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/listctrl/makefile.vc b/samples/listctrl/makefile.vc
index 67d30bc47f..ec33938539 100644
--- a/samples/listctrl/makefile.vc
+++ b/samples/listctrl/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in
index 11bc373164..f5a0489273 100644
--- a/samples/mdi/Makefile.in
+++ b/samples/mdi/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc
index d71c81dcb1..9d3bda015a 100644
--- a/samples/mdi/makefile.gcc
+++ b/samples/mdi/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc
index 4b1c3ca0f9..9bd715509a 100644
--- a/samples/mdi/makefile.vc
+++ b/samples/mdi/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/mediaplayer/Makefile.in b/samples/mediaplayer/Makefile.in
index 85bc71e928..71c3087966 100644
--- a/samples/mediaplayer/Makefile.in
+++ b/samples/mediaplayer/Makefile.in
@@ -119,11 +119,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/mediaplayer/makefile.gcc b/samples/mediaplayer/makefile.gcc
index 8d48080a35..a2bc475fce 100644
--- a/samples/mediaplayer/makefile.gcc
+++ b/samples/mediaplayer/makefile.gcc
@@ -152,9 +152,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/mediaplayer/makefile.vc b/samples/mediaplayer/makefile.vc
index b739b68393..3c602dea4a 100644
--- a/samples/mediaplayer/makefile.vc
+++ b/samples/mediaplayer/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/menu/Makefile.in b/samples/menu/Makefile.in
index b6155d1e23..c1734d0a15 100644
--- a/samples/menu/Makefile.in
+++ b/samples/menu/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/menu/makefile.gcc b/samples/menu/makefile.gcc
index b86c2ce731..82d3c0b489 100644
--- a/samples/menu/makefile.gcc
+++ b/samples/menu/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/menu/makefile.vc b/samples/menu/makefile.vc
index b476fba4af..cc02cd54d9 100644
--- a/samples/menu/makefile.vc
+++ b/samples/menu/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/mfc/makefile.vc b/samples/mfc/makefile.vc
index c4216089bd..0c517d2a99 100644
--- a/samples/mfc/makefile.vc
+++ b/samples/mfc/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in
index 22aaf933cb..5a81756aa7 100644
--- a/samples/minimal/Makefile.in
+++ b/samples/minimal/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/minimal/makefile.gcc b/samples/minimal/makefile.gcc
index d31073fa50..8e9d24b929 100644
--- a/samples/minimal/makefile.gcc
+++ b/samples/minimal/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index 4fb8767d4b..a0b67627a5 100644
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/nativdlg/Makefile.in b/samples/nativdlg/Makefile.in
index 1ac089b92f..b4457c498c 100644
--- a/samples/nativdlg/Makefile.in
+++ b/samples/nativdlg/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/nativdlg/makefile.gcc b/samples/nativdlg/makefile.gcc
index b1cf0f3c0e..a60a347b45 100644
--- a/samples/nativdlg/makefile.gcc
+++ b/samples/nativdlg/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/nativdlg/makefile.vc b/samples/nativdlg/makefile.vc
index 7672280bba..3b5d8d739a 100644
--- a/samples/nativdlg/makefile.vc
+++ b/samples/nativdlg/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/notebook/Makefile.in b/samples/notebook/Makefile.in
index 63fdf67c65..013e34e1b0 100644
--- a/samples/notebook/Makefile.in
+++ b/samples/notebook/Makefile.in
@@ -115,11 +115,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/notebook/makefile.gcc b/samples/notebook/makefile.gcc
index 807ba3ddb1..0f7632f3d9 100644
--- a/samples/notebook/makefile.gcc
+++ b/samples/notebook/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/notebook/makefile.vc b/samples/notebook/makefile.vc
index 19621ba3b9..f6cd4761d7 100644
--- a/samples/notebook/makefile.vc
+++ b/samples/notebook/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/oleauto/Makefile.in b/samples/oleauto/Makefile.in
index 28b0a17afe..747fdf1454 100644
--- a/samples/oleauto/Makefile.in
+++ b/samples/oleauto/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/oleauto/makefile.gcc b/samples/oleauto/makefile.gcc
index f95f444722..b44cbfdebe 100644
--- a/samples/oleauto/makefile.gcc
+++ b/samples/oleauto/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/oleauto/makefile.vc b/samples/oleauto/makefile.vc
index 9b4e9c5587..6891757ac9 100644
--- a/samples/oleauto/makefile.vc
+++ b/samples/oleauto/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/opengl/cube/Makefile.in b/samples/opengl/cube/Makefile.in
index a16a0d85a3..127d0d6a48 100644
--- a/samples/opengl/cube/Makefile.in
+++ b/samples/opengl/cube/Makefile.in
@@ -115,11 +115,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/opengl/cube/makefile.gcc b/samples/opengl/cube/makefile.gcc
index 45b612ad3a..fa4d106a46 100644
--- a/samples/opengl/cube/makefile.gcc
+++ b/samples/opengl/cube/makefile.gcc
@@ -149,9 +149,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/opengl/cube/makefile.vc b/samples/opengl/cube/makefile.vc
index 8d2155aa73..98cb4a2ad5 100644
--- a/samples/opengl/cube/makefile.vc
+++ b/samples/opengl/cube/makefile.vc
@@ -378,7 +378,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in
index 007e8c10a8..39b3c72313 100644
--- a/samples/opengl/isosurf/Makefile.in
+++ b/samples/opengl/isosurf/Makefile.in
@@ -116,11 +116,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/opengl/isosurf/makefile.gcc b/samples/opengl/isosurf/makefile.gcc
index 8366d92f2e..37d7b1d431 100644
--- a/samples/opengl/isosurf/makefile.gcc
+++ b/samples/opengl/isosurf/makefile.gcc
@@ -149,9 +149,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/opengl/isosurf/makefile.vc b/samples/opengl/isosurf/makefile.vc
index 9ec57ff085..97a19a2d96 100644
--- a/samples/opengl/isosurf/makefile.vc
+++ b/samples/opengl/isosurf/makefile.vc
@@ -378,7 +378,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in
index 20e6d66281..60c3c1c1ad 100644
--- a/samples/opengl/penguin/Makefile.in
+++ b/samples/opengl/penguin/Makefile.in
@@ -127,11 +127,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc
index f9078e2de8..c482329c10 100644
--- a/samples/opengl/penguin/makefile.gcc
+++ b/samples/opengl/penguin/makefile.gcc
@@ -156,9 +156,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc
index f4e235f5eb..215c70b202 100644
--- a/samples/opengl/penguin/makefile.vc
+++ b/samples/opengl/penguin/makefile.vc
@@ -390,7 +390,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/opengl/pyramid/Makefile.in b/samples/opengl/pyramid/Makefile.in
index ec24f92db3..3f64ee2cb2 100644
--- a/samples/opengl/pyramid/Makefile.in
+++ b/samples/opengl/pyramid/Makefile.in
@@ -119,11 +119,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/opengl/pyramid/makefile.gcc b/samples/opengl/pyramid/makefile.gcc
index 45e309a39d..fb68628929 100644
--- a/samples/opengl/pyramid/makefile.gcc
+++ b/samples/opengl/pyramid/makefile.gcc
@@ -152,9 +152,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/opengl/pyramid/makefile.vc b/samples/opengl/pyramid/makefile.vc
index 1de93ed254..fed9a54f8b 100644
--- a/samples/opengl/pyramid/makefile.vc
+++ b/samples/opengl/pyramid/makefile.vc
@@ -381,7 +381,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/ownerdrw/Makefile.in b/samples/ownerdrw/Makefile.in
index 1e8541709d..cf28d03236 100644
--- a/samples/ownerdrw/Makefile.in
+++ b/samples/ownerdrw/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/ownerdrw/makefile.gcc b/samples/ownerdrw/makefile.gcc
index c401e88982..b26989153b 100644
--- a/samples/ownerdrw/makefile.gcc
+++ b/samples/ownerdrw/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/ownerdrw/makefile.vc b/samples/ownerdrw/makefile.vc
index dbfa3bd820..0189e449ab 100644
--- a/samples/ownerdrw/makefile.vc
+++ b/samples/ownerdrw/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/popup/Makefile.in b/samples/popup/Makefile.in
index 6afeabe9fe..e2412f6451 100644
--- a/samples/popup/Makefile.in
+++ b/samples/popup/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/popup/makefile.gcc b/samples/popup/makefile.gcc
index 69385de076..51be917399 100644
--- a/samples/popup/makefile.gcc
+++ b/samples/popup/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/popup/makefile.vc b/samples/popup/makefile.vc
index d894746a43..d3bb8192d2 100644
--- a/samples/popup/makefile.vc
+++ b/samples/popup/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/power/Makefile.in b/samples/power/Makefile.in
index f129e32ded..ed1cb6455b 100644
--- a/samples/power/Makefile.in
+++ b/samples/power/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/power/makefile.gcc b/samples/power/makefile.gcc
index 4d1b9ff2c7..75acecce37 100644
--- a/samples/power/makefile.gcc
+++ b/samples/power/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/power/makefile.vc b/samples/power/makefile.vc
index c4005f3385..19ff80c840 100644
--- a/samples/power/makefile.vc
+++ b/samples/power/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/preferences/Makefile.in b/samples/preferences/Makefile.in
index 0a739ffc54..346775d483 100644
--- a/samples/preferences/Makefile.in
+++ b/samples/preferences/Makefile.in
@@ -115,11 +115,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/preferences/makefile.gcc b/samples/preferences/makefile.gcc
index 0014883f1b..accd76a842 100644
--- a/samples/preferences/makefile.gcc
+++ b/samples/preferences/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/preferences/makefile.vc b/samples/preferences/makefile.vc
index 3ece990c42..4851d2e6a6 100644
--- a/samples/preferences/makefile.vc
+++ b/samples/preferences/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/printing/Makefile.in b/samples/printing/Makefile.in
index 38ab61a710..93709c9686 100644
--- a/samples/printing/Makefile.in
+++ b/samples/printing/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/printing/makefile.gcc b/samples/printing/makefile.gcc
index e030bc60db..5fb972f1d4 100644
--- a/samples/printing/makefile.gcc
+++ b/samples/printing/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/printing/makefile.vc b/samples/printing/makefile.vc
index 0666695ffd..fe95e62b9d 100644
--- a/samples/printing/makefile.vc
+++ b/samples/printing/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/propgrid/Makefile.in b/samples/propgrid/Makefile.in
index f4fa464b97..a6348acb64 100644
--- a/samples/propgrid/Makefile.in
+++ b/samples/propgrid/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/propgrid/makefile.gcc b/samples/propgrid/makefile.gcc
index 635b500a93..e73e8f97fe 100644
--- a/samples/propgrid/makefile.gcc
+++ b/samples/propgrid/makefile.gcc
@@ -152,9 +152,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/propgrid/makefile.vc b/samples/propgrid/makefile.vc
index b2ad4456a9..f90195e98e 100644
--- a/samples/propgrid/makefile.vc
+++ b/samples/propgrid/makefile.vc
@@ -381,7 +381,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/regtest/Makefile.in b/samples/regtest/Makefile.in
index 06892b8135..a971895b50 100644
--- a/samples/regtest/Makefile.in
+++ b/samples/regtest/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/regtest/makefile.gcc b/samples/regtest/makefile.gcc
index c18af855aa..64214a78ca 100644
--- a/samples/regtest/makefile.gcc
+++ b/samples/regtest/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/regtest/makefile.vc b/samples/regtest/makefile.vc
index 2e39ac4302..d26ce3c6bd 100644
--- a/samples/regtest/makefile.vc
+++ b/samples/regtest/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/render/Makefile.in b/samples/render/Makefile.in
index 247e324676..d4346c3be3 100644
--- a/samples/render/Makefile.in
+++ b/samples/render/Makefile.in
@@ -124,11 +124,17 @@ COND_PLATFORM_OS2_1___render___os2_emxbindcmd = $(NM) render$(EXEEXT) | if grep
 @COND_TOOLKIT_OSX_IPHONE@	= $(__render_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_COCOA@____render_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_COCOA@	$(__render_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 COND_SHARED_1___renddll___depname = \
 	$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
 @COND_SHARED_1@__renddll___depname = $(COND_SHARED_1___renddll___depname)
 @COND_SHARED_1@__install_renddll___depname = install_renddll
 @COND_SHARED_1@__uninstall_renddll___depname = uninstall_renddll
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
 @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@@ -143,12 +149,10 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -218,7 +222,7 @@ render$(EXEEXT): $(RENDER_OBJECTS) $(__render___win32rc)
 @COND_PLATFORM_MACOSX_1@render_bundle: $(____render_BUNDLE_TGT_REF_DEP)
 
 @COND_SHARED_1@$(DLLPREFIX_MODULE)renddll_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(RENDDLL_OBJECTS)
-@COND_SHARED_1@	$(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_SHARED_1@	$(SHARED_LD_MODULE_CXX) $@ $(RENDDLL_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_SHARED_1@install_renddll: $(__renddll___depname)
 @COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
diff --git a/samples/render/makefile.gcc b/samples/render/makefile.gcc
index e6bc3dd60b..558cd9f799 100644
--- a/samples/render/makefile.gcc
+++ b/samples/render/makefile.gcc
@@ -104,10 +104,20 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(SHARED),1)
 __renddll___depname = \
 	$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
 endif
@@ -163,10 +173,8 @@ ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
 endif
 endif
-ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
-endif
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -229,7 +237,7 @@ $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample_rc.o
 
 ifeq ($(SHARED),1)
 $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll: $(RENDDLL_OBJECTS)
-	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 endif
 
 $(OBJS)\render_sample_rc.o: ./../../samples/sample.rc
diff --git a/samples/render/makefile.vc b/samples/render/makefile.vc
index 55390e2deb..674786b823 100644
--- a/samples/render/makefile.vc
+++ b/samples/render/makefile.vc
@@ -254,6 +254,9 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
 !if "$(SHARED)" == "1"
 __renddll___depname = \
 	$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll
@@ -276,6 +279,9 @@ __RUNTIME_LIBS_27 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_27 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = /Zi
 !endif
@@ -414,8 +420,8 @@ __WXLIB_MONO_p = \
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -461,7 +467,7 @@ $(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res
 !if "$(SHARED)" == "1"
 $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll: $(RENDDLL_OBJECTS)
 	link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).pdb" $(__DEBUGINFO_19)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(RENDDLL_OBJECTS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(RENDDLL_OBJECTS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
diff --git a/samples/ribbon/Makefile.in b/samples/ribbon/Makefile.in
index a7dd87a186..bef6e77b06 100644
--- a/samples/ribbon/Makefile.in
+++ b/samples/ribbon/Makefile.in
@@ -115,11 +115,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/ribbon/makefile.gcc b/samples/ribbon/makefile.gcc
index 87ed75463f..25dd5ba76c 100644
--- a/samples/ribbon/makefile.gcc
+++ b/samples/ribbon/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/ribbon/makefile.vc b/samples/ribbon/makefile.vc
index 616a2a79d7..ad5c9f9413 100644
--- a/samples/ribbon/makefile.vc
+++ b/samples/ribbon/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/richtext/Makefile.in b/samples/richtext/Makefile.in
index dbf2f34814..7550624de9 100644
--- a/samples/richtext/Makefile.in
+++ b/samples/richtext/Makefile.in
@@ -122,11 +122,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/richtext/makefile.gcc b/samples/richtext/makefile.gcc
index 2f5a15a0dc..00f6788be2 100644
--- a/samples/richtext/makefile.gcc
+++ b/samples/richtext/makefile.gcc
@@ -158,9 +158,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/richtext/makefile.vc b/samples/richtext/makefile.vc
index fbd1996f2e..ade955a4f1 100644
--- a/samples/richtext/makefile.vc
+++ b/samples/richtext/makefile.vc
@@ -387,7 +387,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/sashtest/Makefile.in b/samples/sashtest/Makefile.in
index 0f449f2a45..caad445fd8 100644
--- a/samples/sashtest/Makefile.in
+++ b/samples/sashtest/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/sashtest/makefile.gcc b/samples/sashtest/makefile.gcc
index 3891c96cad..8e5eba86ce 100644
--- a/samples/sashtest/makefile.gcc
+++ b/samples/sashtest/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/sashtest/makefile.vc b/samples/sashtest/makefile.vc
index d488abb8cc..beb67e6f44 100644
--- a/samples/sashtest/makefile.vc
+++ b/samples/sashtest/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/scroll/Makefile.in b/samples/scroll/Makefile.in
index 14c6be34ff..6ceefec8b6 100644
--- a/samples/scroll/Makefile.in
+++ b/samples/scroll/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/scroll/makefile.gcc b/samples/scroll/makefile.gcc
index e1a30e246f..eff029fb9b 100644
--- a/samples/scroll/makefile.gcc
+++ b/samples/scroll/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/scroll/makefile.vc b/samples/scroll/makefile.vc
index 56f5b8bf25..2be632560a 100644
--- a/samples/scroll/makefile.vc
+++ b/samples/scroll/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/secretstore/Makefile.in b/samples/secretstore/Makefile.in
index 13d8b20533..c2d662a87b 100644
--- a/samples/secretstore/Makefile.in
+++ b/samples/secretstore/Makefile.in
@@ -74,11 +74,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/secretstore/makefile.gcc b/samples/secretstore/makefile.gcc
index 487fc05ba2..2e12b0f1c3 100644
--- a/samples/secretstore/makefile.gcc
+++ b/samples/secretstore/makefile.gcc
@@ -117,9 +117,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/secretstore/makefile.vc b/samples/secretstore/makefile.vc
index 25b091bba2..72d728cd8d 100644
--- a/samples/secretstore/makefile.vc
+++ b/samples/secretstore/makefile.vc
@@ -283,7 +283,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/shaped/Makefile.in b/samples/shaped/Makefile.in
index b101cf0efb..c3bdf8f9de 100644
--- a/samples/shaped/Makefile.in
+++ b/samples/shaped/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/shaped/makefile.gcc b/samples/shaped/makefile.gcc
index 929622e90d..0a643826ed 100644
--- a/samples/shaped/makefile.gcc
+++ b/samples/shaped/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/shaped/makefile.vc b/samples/shaped/makefile.vc
index d9a7d11c28..06fb931251 100644
--- a/samples/shaped/makefile.vc
+++ b/samples/shaped/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in
index 077339c6d6..76d569f21a 100644
--- a/samples/sockets/Makefile.in
+++ b/samples/sockets/Makefile.in
@@ -105,6 +105,9 @@ COND_PLATFORM_OS2_1___client___os2_emxbindcmd = $(NM) client$(EXEEXT) | if grep
 @COND_TOOLKIT_OSX_COCOA@	= $(__client_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____client_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__client_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 @COND_USE_GUI_1@__server___depname = server$(EXEEXT)
 COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep \
 	-q pmwin.763 ; then emxbind -ep server$(EXEEXT) ; fi
@@ -123,6 +126,9 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
 @COND_TOOLKIT_OSX_COCOA@	= $(__server_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____server_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__server_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
 @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
 @COND_MONOLITHIC_1@__LIB_PNG_IF_MONO_p_1 = $(__LIB_PNG_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
@@ -139,12 +145,10 @@ COND_PLATFORM_OS2_1___server___os2_emxbindcmd = $(NM) server$(EXEEXT) | if grep
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -231,7 +235,7 @@ distclean: clean
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@client_bundle: $(____client_BUNDLE_TGT_REF_DEP)
 
 @COND_USE_GUI_1@server$(EXEEXT): $(SERVER_OBJECTS) $(__server___win32rc)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(SERVER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(SERVER_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 @COND_USE_GUI_1@	$(__server___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@server.app/Contents/PkgInfo: $(__server___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
diff --git a/samples/sockets/makefile.gcc b/samples/sockets/makefile.gcc
index 0f991c01d2..7d1e8f8094 100644
--- a/samples/sockets/makefile.gcc
+++ b/samples/sockets/makefile.gcc
@@ -90,10 +90,20 @@ endif
 ifeq ($(USE_GUI),1)
 __client___depname = $(OBJS)\client.exe
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(USE_GUI),1)
 __server___depname = $(OBJS)\server.exe
 endif
 ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+endif
+endif
+ifeq ($(MONOLITHIC),1)
 __LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)
 endif
 ifeq ($(MONOLITHIC),1)
@@ -132,10 +142,8 @@ ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
 endif
 endif
-ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
-endif
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -257,7 +265,7 @@ ifeq ($(USE_GUI),1)
 $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample_rc.o
 	$(foreach f,$(subst \,/,$(SERVER_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 endif
 
diff --git a/samples/sockets/makefile.vc b/samples/sockets/makefile.vc
index 1da8631869..48a7c6715e 100644
--- a/samples/sockets/makefile.vc
+++ b/samples/sockets/makefile.vc
@@ -218,6 +218,9 @@ __RUNTIME_LIBS_10 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_10 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
 !if "$(USE_GUI)" == "1"
 __server___depname = $(OBJS)\server.exe
 !endif
@@ -239,6 +242,9 @@ __RUNTIME_LIBS_26 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_26 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_34 = $(__DEBUGRUNTIME_2)
 !endif
@@ -342,8 +348,8 @@ __WXLIB_CORE_p = \
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -535,7 +541,7 @@ $(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_sample.res
 !if "$(USE_GUI)" == "1"
 $(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(__DEBUGINFO_18)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(SERVER_OBJECTS) $(SERVER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(SERVER_OBJECTS) $(SERVER_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 67b0d861c9..57b0ddafb3 100644
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index 1b9895ae10..61a11509b9 100644
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index 90b81e2fe0..7ab322c8eb 100644
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/splash/Makefile.in b/samples/splash/Makefile.in
index ca37ac4663..cf53816743 100644
--- a/samples/splash/Makefile.in
+++ b/samples/splash/Makefile.in
@@ -116,11 +116,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/splash/makefile.gcc b/samples/splash/makefile.gcc
index 79691688c0..979bba6142 100644
--- a/samples/splash/makefile.gcc
+++ b/samples/splash/makefile.gcc
@@ -152,9 +152,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/splash/makefile.vc b/samples/splash/makefile.vc
index 9050885825..c11b680fe3 100644
--- a/samples/splash/makefile.vc
+++ b/samples/splash/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/splitter/Makefile.in b/samples/splitter/Makefile.in
index 40eebeeb12..e2e2a73d34 100644
--- a/samples/splitter/Makefile.in
+++ b/samples/splitter/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/splitter/makefile.gcc b/samples/splitter/makefile.gcc
index 16f634f596..3384891cac 100644
--- a/samples/splitter/makefile.gcc
+++ b/samples/splitter/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/splitter/makefile.vc b/samples/splitter/makefile.vc
index 6c7cf0b705..8aad5506f1 100644
--- a/samples/splitter/makefile.vc
+++ b/samples/splitter/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/statbar/Makefile.in b/samples/statbar/Makefile.in
index cfc598a40f..fc2a888117 100644
--- a/samples/statbar/Makefile.in
+++ b/samples/statbar/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/statbar/makefile.gcc b/samples/statbar/makefile.gcc
index 28fd842e81..94f7721c27 100644
--- a/samples/statbar/makefile.gcc
+++ b/samples/statbar/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/statbar/makefile.vc b/samples/statbar/makefile.vc
index f53fe989f5..e6408df7d5 100644
--- a/samples/statbar/makefile.vc
+++ b/samples/statbar/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/stc/Makefile.in b/samples/stc/Makefile.in
index 526835347a..4ea2ec2b56 100644
--- a/samples/stc/Makefile.in
+++ b/samples/stc/Makefile.in
@@ -118,11 +118,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -138,6 +135,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_wxUSE_REGEX_builtin@	-lwxregexu$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
 @COND_wxUSE_EXPAT_builtin@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 
 ### Targets: ###
 
@@ -159,7 +160,7 @@ distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
 
 stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
-	$(CXX) -o $@ $(STCTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_STC) $(LIBS)
+	$(CXX) -o $@ $(STCTEST_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(EXTRALIBS_STC) $(LIBS)
 	$(__stctest___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1@stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index f061904df8..7f05985acc 100644
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -154,7 +154,7 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
 ifeq ($(USE_GUI),1)
@@ -194,6 +194,9 @@ endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 
 
 all: $(OBJS)
@@ -212,7 +215,7 @@ clean:
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample_rc.o
 	$(foreach f,$(subst \,/,$(STCTEST_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme -lwxscintilla$(WXDEBUGFLAG) -lwxlexilla$(WXDEBUGFLAG) -limm32
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) -limm32
 	@-del $@.rsp
 
 data: 
diff --git a/samples/stc/makefile.vc b/samples/stc/makefile.vc
index 08b0ef10f4..a0efc60208 100644
--- a/samples/stc/makefile.vc
+++ b/samples/stc/makefile.vc
@@ -381,7 +381,7 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -398,6 +398,9 @@ __CAIRO_LIB_p = cairo.lib
 !if "$(USE_CAIRO)" == "1"
 ____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
 !endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
+!endif
 
 
 all: $(OBJS)
@@ -418,7 +421,7 @@ clean:
 
 $(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
-	$(STCTEST_OBJECTS) $(STCTEST_RESOURCES)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib wxscintilla$(WXDEBUGFLAG).lib wxlexilla$(WXDEBUGFLAG).lib imm32.lib
+	$(STCTEST_OBJECTS) $(STCTEST_RESOURCES)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) imm32.lib
 <<
 
 data: 
diff --git a/samples/svg/Makefile.in b/samples/svg/Makefile.in
index 13a22f0a45..0a0db17a32 100644
--- a/samples/svg/Makefile.in
+++ b/samples/svg/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/svg/makefile.gcc b/samples/svg/makefile.gcc
index 42bdcd1bfb..22c0c23f7e 100644
--- a/samples/svg/makefile.gcc
+++ b/samples/svg/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/svg/makefile.vc b/samples/svg/makefile.vc
index d13a1c33d4..9d43faeb32 100644
--- a/samples/svg/makefile.vc
+++ b/samples/svg/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/taborder/Makefile.in b/samples/taborder/Makefile.in
index 9c7b3531c5..c2f41f312c 100644
--- a/samples/taborder/Makefile.in
+++ b/samples/taborder/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/taborder/makefile.gcc b/samples/taborder/makefile.gcc
index 501e5a136f..21056c825b 100644
--- a/samples/taborder/makefile.gcc
+++ b/samples/taborder/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/taborder/makefile.vc b/samples/taborder/makefile.vc
index 3f2089e2c4..5750a3b369 100644
--- a/samples/taborder/makefile.vc
+++ b/samples/taborder/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/taskbar/Makefile.in b/samples/taskbar/Makefile.in
index 54e91dbba3..1e66434aa5 100644
--- a/samples/taskbar/Makefile.in
+++ b/samples/taskbar/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/taskbar/makefile.gcc b/samples/taskbar/makefile.gcc
index 8b09654a2a..21caf49c38 100644
--- a/samples/taskbar/makefile.gcc
+++ b/samples/taskbar/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/taskbar/makefile.vc b/samples/taskbar/makefile.vc
index 11aca10b41..6714c2d5db 100644
--- a/samples/taskbar/makefile.vc
+++ b/samples/taskbar/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/taskbarbutton/Makefile.in b/samples/taskbarbutton/Makefile.in
index df491dc291..3b240e374e 100644
--- a/samples/taskbarbutton/Makefile.in
+++ b/samples/taskbarbutton/Makefile.in
@@ -119,11 +119,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/taskbarbutton/makefile.gcc b/samples/taskbarbutton/makefile.gcc
index 50f0dd0355..6d344526e2 100644
--- a/samples/taskbarbutton/makefile.gcc
+++ b/samples/taskbarbutton/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/taskbarbutton/makefile.vc b/samples/taskbarbutton/makefile.vc
index a026471b63..78a65993d0 100644
--- a/samples/taskbarbutton/makefile.vc
+++ b/samples/taskbarbutton/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/text/Makefile.in b/samples/text/Makefile.in
index 28631a1a7e..31ce5dcec2 100644
--- a/samples/text/Makefile.in
+++ b/samples/text/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/text/makefile.gcc b/samples/text/makefile.gcc
index a7f5fc162a..8aa83becfb 100644
--- a/samples/text/makefile.gcc
+++ b/samples/text/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/text/makefile.vc b/samples/text/makefile.vc
index cee2d040a8..fdeac176aa 100644
--- a/samples/text/makefile.vc
+++ b/samples/text/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/thread/Makefile.in b/samples/thread/Makefile.in
index 65a12f19f3..b6fc95016a 100644
--- a/samples/thread/Makefile.in
+++ b/samples/thread/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/thread/makefile.gcc b/samples/thread/makefile.gcc
index 9323de5bf5..c5e656b22e 100644
--- a/samples/thread/makefile.gcc
+++ b/samples/thread/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/thread/makefile.vc b/samples/thread/makefile.vc
index 23f1baad4a..a1c22eaa61 100644
--- a/samples/thread/makefile.vc
+++ b/samples/thread/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 24e0079f25..d7faedbefa 100644
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/toolbar/makefile.gcc b/samples/toolbar/makefile.gcc
index b177fd4a4a..a512e8ecb5 100644
--- a/samples/toolbar/makefile.gcc
+++ b/samples/toolbar/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/toolbar/makefile.vc b/samples/toolbar/makefile.vc
index c35166cccf..5bbf144a3e 100644
--- a/samples/toolbar/makefile.vc
+++ b/samples/toolbar/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/treectrl/Makefile.in b/samples/treectrl/Makefile.in
index b430e97448..b9fb865318 100644
--- a/samples/treectrl/Makefile.in
+++ b/samples/treectrl/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/treectrl/makefile.gcc b/samples/treectrl/makefile.gcc
index dd626df1d6..de0ee07e23 100644
--- a/samples/treectrl/makefile.gcc
+++ b/samples/treectrl/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/treectrl/makefile.vc b/samples/treectrl/makefile.vc
index d61a76bf97..de4e032288 100644
--- a/samples/treectrl/makefile.vc
+++ b/samples/treectrl/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in
index 86757cfa65..6fd1fc66c4 100644
--- a/samples/treelist/Makefile.in
+++ b/samples/treelist/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc
index 01cc29ba3e..8e69ba9b7c 100644
--- a/samples/treelist/makefile.gcc
+++ b/samples/treelist/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc
index acc1da3c4a..6afbecad81 100644
--- a/samples/treelist/makefile.vc
+++ b/samples/treelist/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/typetest/Makefile.in b/samples/typetest/Makefile.in
index f734651771..5291dae27b 100644
--- a/samples/typetest/Makefile.in
+++ b/samples/typetest/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/typetest/makefile.gcc b/samples/typetest/makefile.gcc
index 04c0b72bd4..e331af043e 100644
--- a/samples/typetest/makefile.gcc
+++ b/samples/typetest/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/typetest/makefile.vc b/samples/typetest/makefile.vc
index f312fef630..d558375afb 100644
--- a/samples/typetest/makefile.vc
+++ b/samples/typetest/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/uiaction/Makefile.in b/samples/uiaction/Makefile.in
index 56b3ab304e..37888db6ba 100644
--- a/samples/uiaction/Makefile.in
+++ b/samples/uiaction/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/uiaction/makefile.gcc b/samples/uiaction/makefile.gcc
index 34864c5abf..23d18bcbb3 100644
--- a/samples/uiaction/makefile.gcc
+++ b/samples/uiaction/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/uiaction/makefile.vc b/samples/uiaction/makefile.vc
index 6e06aefca4..e01dcc57c0 100644
--- a/samples/uiaction/makefile.vc
+++ b/samples/uiaction/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/validate/Makefile.in b/samples/validate/Makefile.in
index a982e45da7..3692c94ab5 100644
--- a/samples/validate/Makefile.in
+++ b/samples/validate/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc
index 7620499307..0f706bf558 100644
--- a/samples/validate/makefile.gcc
+++ b/samples/validate/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/validate/makefile.vc b/samples/validate/makefile.vc
index c6e1a0e24e..363a96cb2c 100644
--- a/samples/validate/makefile.vc
+++ b/samples/validate/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/vscroll/Makefile.in b/samples/vscroll/Makefile.in
index 4750a5b0bd..16a911f570 100644
--- a/samples/vscroll/Makefile.in
+++ b/samples/vscroll/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/vscroll/makefile.gcc b/samples/vscroll/makefile.gcc
index f8cdade8dc..285171ad41 100644
--- a/samples/vscroll/makefile.gcc
+++ b/samples/vscroll/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/vscroll/makefile.vc b/samples/vscroll/makefile.vc
index 1f9ee8ce85..b4cd7f1689 100644
--- a/samples/vscroll/makefile.vc
+++ b/samples/vscroll/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/webrequest/Makefile.in b/samples/webrequest/Makefile.in
index 5a8cc9a84b..03f2e345ef 100644
--- a/samples/webrequest/Makefile.in
+++ b/samples/webrequest/Makefile.in
@@ -115,11 +115,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/webrequest/makefile.gcc b/samples/webrequest/makefile.gcc
index 501b5016f3..bdcf9925ea 100644
--- a/samples/webrequest/makefile.gcc
+++ b/samples/webrequest/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/webrequest/makefile.vc b/samples/webrequest/makefile.vc
index 724508c42f..0dd8b2e1f3 100644
--- a/samples/webrequest/makefile.vc
+++ b/samples/webrequest/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/webview/Makefile.in b/samples/webview/Makefile.in
index 7cd8dbe4f6..e213785719 100644
--- a/samples/webview/Makefile.in
+++ b/samples/webview/Makefile.in
@@ -120,11 +120,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -140,6 +137,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_wxUSE_REGEX_builtin@	-lwxregexu$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
 @COND_wxUSE_EXPAT_builtin@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 
 ### Targets: ###
 
@@ -161,7 +162,7 @@ distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile
 
 webview$(EXEEXT): $(WEBVIEW_OBJECTS) $(__webview___win32rc)
-	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+	$(CXX) -o $@ $(WEBVIEW_OBJECTS)    -L$(LIBDIRNAME)  $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 	$(__webview___os2_emxbindcmd)
 
 @COND_PLATFORM_MACOSX_1@webview.app/Contents/PkgInfo: webview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
diff --git a/samples/webview/makefile.gcc b/samples/webview/makefile.gcc
index e520c630ff..aa0bbfbab7 100644
--- a/samples/webview/makefile.gcc
+++ b/samples/webview/makefile.gcc
@@ -158,7 +158,7 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
 ifeq ($(USE_GUI),1)
@@ -198,6 +198,9 @@ endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 
 
 all: $(OBJS)
@@ -216,7 +219,7 @@ clean:
 $(OBJS)\webview.exe: $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample_rc.o
 	$(foreach f,$(subst \,/,$(WEBVIEW_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) -lwxlexilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)  -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 
 data: 
diff --git a/samples/webview/makefile.vc b/samples/webview/makefile.vc
index e8dcbc9f1a..0f314f7396 100644
--- a/samples/webview/makefile.vc
+++ b/samples/webview/makefile.vc
@@ -383,7 +383,7 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -400,6 +400,9 @@ __CAIRO_LIB_p = cairo.lib
 !if "$(USE_CAIRO)" == "1"
 ____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
 !endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
+!endif
 
 
 all: $(OBJS)
@@ -420,7 +423,7 @@ clean:
 
 $(OBJS)\webview.exe: $(WEBVIEW_OBJECTS) $(OBJS)\webview_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_1) /pdb:"$(OBJS)\webview.pdb" $(__DEBUGINFO_2)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
-	$(WEBVIEW_OBJECTS) $(WEBVIEW_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib wxlexilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(WEBVIEW_OBJECTS) $(WEBVIEW_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 
 data: 
diff --git a/samples/widgets/Makefile.in b/samples/widgets/Makefile.in
index c9b5ab45e0..3daa0651ea 100644
--- a/samples/widgets/Makefile.in
+++ b/samples/widgets/Makefile.in
@@ -151,11 +151,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc
index 678ad26ae9..d843578063 100644
--- a/samples/widgets/makefile.gcc
+++ b/samples/widgets/makefile.gcc
@@ -177,9 +177,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/widgets/makefile.vc b/samples/widgets/makefile.vc
index e604614068..1be16b8dd8 100644
--- a/samples/widgets/makefile.vc
+++ b/samples/widgets/makefile.vc
@@ -406,7 +406,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 9e35ac4f61..070bd38f5b 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/wizard/makefile.gcc b/samples/wizard/makefile.gcc
index bb6012e18e..05620a80b4 100644
--- a/samples/wizard/makefile.gcc
+++ b/samples/wizard/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/wizard/makefile.vc b/samples/wizard/makefile.vc
index 76c1513f3f..c80c8ff9b9 100644
--- a/samples/wizard/makefile.vc
+++ b/samples/wizard/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/wrapsizer/Makefile.in b/samples/wrapsizer/Makefile.in
index 0c3cbb4464..204e588fa9 100644
--- a/samples/wrapsizer/Makefile.in
+++ b/samples/wrapsizer/Makefile.in
@@ -112,11 +112,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/wrapsizer/makefile.gcc b/samples/wrapsizer/makefile.gcc
index d0ee9100a2..7ad00812ae 100644
--- a/samples/wrapsizer/makefile.gcc
+++ b/samples/wrapsizer/makefile.gcc
@@ -146,9 +146,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/wrapsizer/makefile.vc b/samples/wrapsizer/makefile.vc
index 9c9c81ef49..f66f67e92b 100644
--- a/samples/wrapsizer/makefile.vc
+++ b/samples/wrapsizer/makefile.vc
@@ -375,7 +375,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index 0cb02fb2a4..a7d9e78048 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -132,11 +132,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index b120e11678..6566ba6d30 100644
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -170,9 +170,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index 25945e4a70..325b92aeca 100644
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -399,7 +399,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/samples/xti/Makefile.in b/samples/xti/Makefile.in
index 0b3f001b94..8ddb6531bc 100644
--- a/samples/xti/Makefile.in
+++ b/samples/xti/Makefile.in
@@ -117,11 +117,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/samples/xti/makefile.gcc b/samples/xti/makefile.gcc
index f771d7c444..2b8ad54f7d 100644
--- a/samples/xti/makefile.gcc
+++ b/samples/xti/makefile.gcc
@@ -152,9 +152,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/samples/xti/makefile.vc b/samples/xti/makefile.vc
index edf5fbcf1e..c160d6b44b 100644
--- a/samples/xti/makefile.vc
+++ b/samples/xti/makefile.vc
@@ -381,7 +381,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 22dbb1d944..760d178820 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -322,9 +322,15 @@ TEST_ALLHEADERS_ODEP = \
 @COND_ICC_PCH_1@	./.pch/testprec_test_drawing/testprec.h.gch
 @COND_USE_PCH_1@_____pch_testprec_test_drawing_testprec_h_gch___depname \
 @COND_USE_PCH_1@	= ./.pch/testprec_test_drawing/testprec.h.gch
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 @COND_SHARED_1_USE_GUI_1@__test_drawingplugin___depname \
 @COND_SHARED_1_USE_GUI_1@	= \
 @COND_SHARED_1_USE_GUI_1@	$(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
 @COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT)
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_gui_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	= test_gui.app/Contents/PkgInfo
@@ -364,6 +370,9 @@ COND_MONOLITHIC_0___WXLIB_HTML_p = \
 COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_PROPGRID_p = $(COND_MONOLITHIC_0___WXLIB_PROPGRID_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_2 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p)
 @COND_USE_GUI_1@__test_allheaders___depname = test_allheaders$(EXEEXT)
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@__test_allheaders_app_Contents_PkgInfo___depname \
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	= test_allheaders.app/Contents/PkgInfo
@@ -391,6 +400,9 @@ COND_MONOLITHIC_0___WXLIB_PROPGRID_p = \
 @COND_ICC_PCH_1@	./.pch/testprec_test_allheaders/testprec.h.gch
 @COND_USE_PCH_1@_____pch_testprec_test_allheaders_testprec_h_gch___depname \
 @COND_USE_PCH_1@	= ./.pch/testprec_test_allheaders/testprec.h.gch
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_3 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_3 = $(__LIB_LEXILLA_p)
 COND_MONOLITHIC_0___WXLIB_XML_p = \
 	-lwx_base$(WXBASEPORT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_XML_p = $(COND_MONOLITHIC_0___WXLIB_XML_p)
@@ -429,12 +441,6 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -450,6 +456,10 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_wxUSE_REGEX_builtin@	-lwxregexu$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
 @COND_wxUSE_EXPAT_builtin@	-lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 
 ### Targets: ###
 
@@ -488,10 +498,10 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_USE_PCH_1@	$(BK_MAKE_PCH) ./.pch/testprec_test_drawing/testprec.h.gch testprec.h $(CXX) $(TEST_DRAWING_CXXFLAGS)
 
 @COND_SHARED_1_USE_GUI_1@$(DLLPREFIX_MODULE)test_drawingplugin.$(SO_SUFFIX_MODULE): $(TEST_DRAWINGPLUGIN_OBJECTS)
-@COND_SHARED_1_USE_GUI_1@	$(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_SHARED_1_USE_GUI_1@	$(SHARED_LD_MODULE_CXX) $@ $(TEST_DRAWINGPLUGIN_OBJECTS)    -L$(LIBDIRNAME) $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_GUI_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p) $(EXTRALIBS_MEDIA) $(__WXLIB_XRC_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_2) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p test_gui.app/Contents
@@ -524,7 +534,7 @@ test$(EXEEXT): $(TEST_OBJECTS)
 @COND_USE_PCH_1@	$(BK_MAKE_PCH) ./.pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS)
 
 @COND_USE_GUI_1@test_allheaders$(EXEEXT): $(TEST_ALLHEADERS_OBJECTS) $(__test_allheaders___win32rc)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(TEST_ALLHEADERS_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_WEBVIEW_p) $(EXTRALIBS_WEBVIEW) $(__WXLIB_STC_p) $(EXTRALIBS_STC) $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__LIB_SCINTILLA_p) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_3) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@test_allheaders.app/Contents/PkgInfo: $(__test_allheaders___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p test_allheaders.app/Contents
diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in
index 01f07edc1e..5f8455b608 100644
--- a/tests/benchmarks/Makefile.in
+++ b/tests/benchmarks/Makefile.in
@@ -113,6 +113,9 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
 @COND_TOOLKIT_OSX_COCOA@	= $(__bench_gui_app_Contents_PkgInfo___depname)
 @COND_TOOLKIT_OSX_IPHONE@____bench_gui_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@	= $(__bench_gui_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 @COND_USE_GUI_1@__bench_graphics___depname = bench_graphics$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__bench_graphics___win32rc = \
 @COND_PLATFORM_WIN32_1@	bench_graphics_sample_rc.o
@@ -133,6 +136,9 @@ COND_MONOLITHIC_0___WXLIB_NET_p = \
 @COND_TOOLKIT_OSX_IPHONE@____bench_graphics_BUNDLE_TGT_REF_DEP \
 @COND_TOOLKIT_OSX_IPHONE@	= \
 @COND_TOOLKIT_OSX_IPHONE@	$(__bench_graphics_app_Contents_PkgInfo___depname)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p_1 \
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
 @COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
@@ -159,12 +165,10 @@ COND_MONOLITHIC_0___WXLIB_BASE_p = \
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@@ -249,7 +253,7 @@ data:
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_gui_bundle: $(____bench_gui_BUNDLE_TGT_REF_DEP)
 
 @COND_USE_GUI_1@bench_graphics$(EXEEXT): $(BENCH_GRAPHICS_OBJECTS) $(__bench_graphics___win32rc)
-@COND_USE_GUI_1@	$(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_USE_GUI_1@	$(CXX) -o $@ $(BENCH_GRAPHICS_OBJECTS)    -L$(LIBDIRNAME)  $(SAMPLES_RPATH_FLAG)  $(LDFLAGS)  $(WX_LDFLAGS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_OPENGL) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p_1) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
 
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@bench_graphics.app/Contents/PkgInfo: $(__bench_graphics___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
 @COND_PLATFORM_MACOSX_1_USE_GUI_1@	mkdir -p bench_graphics.app/Contents
diff --git a/tests/benchmarks/makefile.gcc b/tests/benchmarks/makefile.gcc
index 5a7a8ebfa2..f9119195df 100644
--- a/tests/benchmarks/makefile.gcc
+++ b/tests/benchmarks/makefile.gcc
@@ -101,9 +101,19 @@ endif
 ifeq ($(USE_GUI),1)
 __bench_gui___depname = $(OBJS)\bench_gui.exe
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(USE_GUI),1)
 __bench_graphics___depname = $(OBJS)\bench_graphics.exe
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
 endif
@@ -186,10 +196,8 @@ ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
 endif
 endif
-ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
-endif
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -267,7 +275,7 @@ ifeq ($(USE_GUI),1)
 $(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample_rc.o
 	$(foreach f,$(subst \,/,$(BENCH_GRAPHICS_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 endif
 
diff --git a/tests/benchmarks/makefile.vc b/tests/benchmarks/makefile.vc
index ff89e897f7..7b9fb42a25 100644
--- a/tests/benchmarks/makefile.vc
+++ b/tests/benchmarks/makefile.vc
@@ -244,6 +244,9 @@ __RUNTIME_LIBS_26 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_26 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
 !if "$(USE_GUI)" == "1"
 __bench_graphics___depname = $(OBJS)\bench_graphics.exe
 !endif
@@ -265,6 +268,9 @@ __RUNTIME_LIBS_42 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_42 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = /Zi
 !endif
@@ -460,8 +466,8 @@ __WXLIB_MONO_p = \
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
@@ -521,7 +527,7 @@ $(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res
 !if "$(USE_GUI)" == "1"
 $(OBJS)\bench_graphics.exe: $(BENCH_GRAPHICS_OBJECTS) $(OBJS)\bench_graphics_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_3) /pdb:"$(OBJS)\bench_graphics.pdb" $(__DEBUGINFO_34)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(BENCH_GRAPHICS_OBJECTS) $(BENCH_GRAPHICS_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(BENCH_GRAPHICS_OBJECTS) $(BENCH_GRAPHICS_RESOURCES)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 5cfe8f93a0..048f3fc3ed 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -305,11 +305,21 @@ endif
 ifeq ($(USE_GUI),1)
 __test_drawing___depname = $(OBJS)\test_drawing.exe
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 __test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
 endif
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(USE_GUI),1)
 __test_gui___depname = $(OBJS)\test_gui.exe
 endif
@@ -339,9 +349,19 @@ ifeq ($(MONOLITHIC),0)
 __WXLIB_PROPGRID_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(USE_GUI),1)
 __test_allheaders___depname = $(OBJS)\test_allheaders.exe
 endif
+ifeq ($(MONOLITHIC),1)
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_IF_MONO_p_3 = $(__LIB_LEXILLA_p)
+endif
+endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_XML_p = \
 	-lwxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
@@ -444,11 +464,6 @@ ifeq ($(USE_STC),1)
 __LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)
 endif
 endif
-ifeq ($(MONOLITHIC),1)
-ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
-endif
-endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
@@ -486,6 +501,9 @@ endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 
 
 all: $(OBJS)
@@ -522,7 +540,7 @@ endif
 ifeq ($(SHARED),1)
 ifeq ($(USE_GUI),1)
 $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
-	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(TEST_DRAWINGPLUGIN_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 endif
 endif
 
@@ -530,7 +548,7 @@ ifeq ($(USE_GUI),1)
 $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o
 	$(foreach f,$(subst \,/,$(TEST_GUI_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) -lwxlexilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 endif
 
@@ -538,7 +556,7 @@ ifeq ($(USE_GUI),1)
 $(OBJS)\test_allheaders.exe: $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_sample_rc.o
 	$(foreach f,$(subst \,/,$(TEST_ALLHEADERS_OBJECTS)),$(shell echo $f >> $(subst \,/,$@).rsp.tmp))
 	@move /y $@.rsp.tmp $@.rsp >nul
-	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) -lwxlexilla$(WXDEBUGFLAG) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
+	$(CXX) -o $@ @$@.rsp  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME)   $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) -limm32 $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  -lwxscintilla$(WXDEBUGFLAG) $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   -lwxzlib$(WXDEBUGFLAG) -lwxregexu$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lws2_32 -lwininet -loleacc -luxtheme
 	@-del $@.rsp
 endif
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 3cebe208e5..41c1452831 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -456,6 +456,9 @@ __RUNTIME_LIBS_27 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_27 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 __test_drawingplugin___depname = $(OBJS)\test_drawingplugin.dll
 !endif
@@ -477,6 +480,9 @@ __RUNTIME_LIBS_45 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_45 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_1 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(USE_GUI)" == "1"
 __test_gui___depname = $(OBJS)\test_gui.exe
 !endif
@@ -522,6 +528,9 @@ __WXLIB_HTML_p = \
 __WXLIB_PROPGRID_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_2 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(USE_GUI)" == "1"
 __test_allheaders___depname = $(OBJS)\test_allheaders.exe
 !endif
@@ -543,6 +552,9 @@ __RUNTIME_LIBS_76 = D
 !if "$(RUNTIME_LIBS)" == "static"
 __RUNTIME_LIBS_76 = $(__THREADSFLAG)
 !endif
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
+__LIB_LEXILLA_IF_MONO_p_3 = $(__LIB_LEXILLA_p)
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_XML_p = \
 	wxbase$(WX_RELEASE_NODOT)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
@@ -754,9 +766,6 @@ __WXLIB_MONO_p = \
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
-!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
-!endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
@@ -772,6 +781,9 @@ __CAIRO_LIB_p = cairo.lib
 !if "$(USE_CAIRO)" == "1"
 ____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib
 !endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
+!endif
 
 
 all: $(OBJS)
@@ -817,21 +829,21 @@ $(OBJS)\test_drawing.exe: $(OBJS)\test_drawing_dummy.obj  $(TEST_DRAWING_OBJECTS
 !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1"
 $(OBJS)\test_drawingplugin.dll: $(TEST_DRAWINGPLUGIN_OBJECTS)
 	link /DLL /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_drawingplugin.pdb" $(__DEBUGINFO_37)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(TEST_DRAWINGPLUGIN_OBJECTS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(TEST_DRAWINGPLUGIN_OBJECTS)   $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_1) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj  $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_gui.pdb" $(__DEBUGINFO_51)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib wxlexilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(TEST_GUI_OBJECTS) $(TEST_GUI_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_AUI_p)  $(__WXLIB_RICHTEXT_p)  $(__WXLIB_MEDIA_p)  $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_HTML_p)  $(__WXLIB_PROPGRID_p)  $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_2) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\test_allheaders.exe: $(OBJS)\test_allheaders_dummy.obj  $(TEST_ALLHEADERS_OBJECTS) $(OBJS)\test_allheaders_sample.res
 	link /NOLOGO /OUT:$@  $(__DEBUGINFO_5) /pdb:"$(OBJS)\test_allheaders.pdb" $(__DEBUGINFO_68)  $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(WIN32_DPI_LINKFLAG) /SUBSYSTEM:CONSOLE $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<<
-	$(TEST_ALLHEADERS_OBJECTS) $(TEST_ALLHEADERS_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib wxlexilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
+	$(TEST_ALLHEADERS_OBJECTS) $(TEST_ALLHEADERS_RESOURCES)  $(__WXLIB_WEBVIEW_p)  $(__WXLIB_STC_p) imm32.lib $(__WXLIB_CORE_p)  $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  wxscintilla$(WXDEBUGFLAG).lib $(__LIB_LEXILLA_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_LEXILLA_IF_MONO_p_3) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)   wxzlib$(WXDEBUGFLAG).lib wxregexu$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib ws2_32.lib wininet.lib
 <<
 !endif
 
diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in
index 38d709c914..4c28f92251 100644
--- a/utils/helpview/src/Makefile.in
+++ b/utils/helpview/src/Makefile.in
@@ -122,11 +122,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/utils/helpview/src/makefile.gcc b/utils/helpview/src/makefile.gcc
index 3891c9924f..358fa3c5a1 100644
--- a/utils/helpview/src/makefile.gcc
+++ b/utils/helpview/src/makefile.gcc
@@ -154,9 +154,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/utils/helpview/src/makefile.vc b/utils/helpview/src/makefile.vc
index 3e1bba22c1..a1e5916a9f 100644
--- a/utils/helpview/src/makefile.vc
+++ b/utils/helpview/src/makefile.vc
@@ -383,7 +383,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in
index a1c4755e8e..f6d043fcb9 100644
--- a/utils/hhp2cached/Makefile.in
+++ b/utils/hhp2cached/Makefile.in
@@ -104,11 +104,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/utils/hhp2cached/makefile.gcc b/utils/hhp2cached/makefile.gcc
index a8a46e5f36..eeead0c6d9 100644
--- a/utils/hhp2cached/makefile.gcc
+++ b/utils/hhp2cached/makefile.gcc
@@ -150,9 +150,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/utils/hhp2cached/makefile.vc b/utils/hhp2cached/makefile.vc
index 2e4d8203c4..9308ffc751 100644
--- a/utils/hhp2cached/makefile.vc
+++ b/utils/hhp2cached/makefile.vc
@@ -379,7 +379,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in
index 868f0c4110..0022a4fb4a 100644
--- a/utils/screenshotgen/src/Makefile.in
+++ b/utils/screenshotgen/src/Makefile.in
@@ -139,11 +139,12 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)u$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_MONOLITHIC_1_USE_STC_1@__LIB_SCINTILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p \
-@COND_MONOLITHIC_1_USE_STC_1@	= \
-@COND_MONOLITHIC_1_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@	= $(__LIB_SCINTILLA_p)
+@COND_USE_STC_1@__LIB_SCINTILLA_p = \
+@COND_USE_STC_1@	-lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1_USE_STC_1@__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+@COND_USE_STC_1@__LIB_LEXILLA_p = \
+@COND_USE_STC_1@	-lwxlexilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(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)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index 1dfc2cab25..8f7abf7f8a 100644
--- a/utils/screenshotgen/src/makefile.gcc
+++ b/utils/screenshotgen/src/makefile.gcc
@@ -166,9 +166,12 @@ endif
 endif
 ifeq ($(MONOLITHIC),1)
 ifeq ($(USE_STC),1)
-__LIB_LEXILLA_IF_MONO_p = -lwxlexilla$(WXDEBUGFLAG)
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
 endif
 endif
+ifeq ($(USE_STC),1)
+__LIB_LEXILLA_p = -lwxlexilla$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index 4391ab180e..74a9d99bb2 100644
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -395,7 +395,10 @@ __WXLIB_MONO_p = \
 __LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
-__LIB_LEXILLA_IF_MONO_p = wxlexilla$(WXDEBUGFLAG).lib
+__LIB_LEXILLA_IF_MONO_p = $(__LIB_LEXILLA_p)
+!endif
+!if "$(USE_STC)" == "1"
+__LIB_LEXILLA_p = wxlexilla$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib