deprecation fixes, plus some code size reduction and cleanup

[wxWidgets.git] / src / stc / Makefile.in

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index ef6471fac45ca24ed8bdf9e02acc2f4827db6602..54e47822076ddd009dbd612351ff127c89a9a57e 100644 (file)
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -51,7 +51,7 @@ HOST_SUFFIX = @HOST_SUFFIX@
 DESTDIR = 
 WX_RELEASE = 2.7
 WX_RELEASE_NODOT = 27
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
 LIBDIRNAME = $(top_builddir)lib
 STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -66,6 +66,7 @@ STCDLL_OBJECTS =  \
        stcdll_AutoComplete.o \
        stcdll_CallTip.o \
        stcdll_CellBuffer.o \
+       stcdll_CharClassify.o \
        stcdll_ContractionState.o \
        stcdll_Document.o \
        stcdll_DocumentAccessor.o \
@@ -100,6 +101,7 @@ STCDLL_OBJECTS =  \
        stcdll_LexGui4Cli.o \
        stcdll_LexHTML.o \
        stcdll_LexHaskell.o \
+       stcdll_LexInno.o \
        stcdll_LexKix.o \
        stcdll_LexLisp.o \
        stcdll_LexLout.o \
@@ -110,6 +112,7 @@ STCDLL_OBJECTS =  \
        stcdll_LexMatlab.o \
        stcdll_LexMetapost.o \
        stcdll_LexNsis.o \
+       stcdll_LexOpal.o \
        stcdll_LexOthers.o \
        stcdll_LexPB.o \
        stcdll_LexPOV.o \
@@ -124,6 +127,8 @@ STCDLL_OBJECTS =  \
        stcdll_LexTADS3.o \
        stcdll_LexScriptol.o \
        stcdll_LexSpecman.o \
+       stcdll_LexSpice.o \
+       stcdll_LexTCL.o \
        stcdll_LexTeX.o \
        stcdll_LexVB.o \
        stcdll_LexVHDL.o \
@@ -151,6 +156,7 @@ STCLIB_OBJECTS =  \
        stclib_AutoComplete.o \
        stclib_CallTip.o \
        stclib_CellBuffer.o \
+       stclib_CharClassify.o \
        stclib_ContractionState.o \
        stclib_Document.o \
        stclib_DocumentAccessor.o \
@@ -185,6 +191,7 @@ STCLIB_OBJECTS =  \
        stclib_LexGui4Cli.o \
        stclib_LexHTML.o \
        stclib_LexHaskell.o \
+       stclib_LexInno.o \
        stclib_LexKix.o \
        stclib_LexLisp.o \
        stclib_LexLout.o \
@@ -195,6 +202,7 @@ STCLIB_OBJECTS =  \
        stclib_LexMatlab.o \
        stclib_LexMetapost.o \
        stclib_LexNsis.o \
+       stclib_LexOpal.o \
        stclib_LexOthers.o \
        stclib_LexPB.o \
        stclib_LexPOV.o \
@@ -209,6 +217,8 @@ STCLIB_OBJECTS =  \
        stclib_LexTADS3.o \
        stclib_LexScriptol.o \
        stclib_LexSpecman.o \
+       stclib_LexSpice.o \
+       stclib_LexTCL.o \
        stclib_LexTeX.o \
        stclib_LexVB.o \
        stclib_LexVHDL.o \
@@ -268,17 +278,17 @@ COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
        -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).0
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__stcdll___targetsuf2 = .$(SO_SUFFIX)
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@__stcdll___targetsuf3 \
 @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     .$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     .$(SO_SUFFIX).1.0.0
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .0.0.0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.0.0.$(SO_SUFFIX)
 @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@__stcdll___targetsuf3 \
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@       = -0.$(SO_SUFFIX)
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@       = -1.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX)
 COND_USE_SOVERLINUX_1___stcdll___soname_flags = \
        $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2)
@@ -375,7 +385,7 @@ distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) $(__stcdll___win32rc)
-@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+@COND_SHARED_1@        $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 @COND_SHARED_1@        
 @COND_SHARED_1@        $(__stcdll___so_symlinks_cmd)
 
@@ -415,6 +425,9 @@ stcdll_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
 stcdll_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CellBuffer.cxx
 
+stcdll_CharClassify.o: $(srcdir)/scintilla/src/CharClassify.cxx
+       $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/CharClassify.cxx
+
 stcdll_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/ContractionState.cxx
 
@@ -517,6 +530,9 @@ stcdll_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
 stcdll_LexHaskell.o: $(srcdir)/scintilla/src/LexHaskell.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexHaskell.cxx
 
+stcdll_LexInno.o: $(srcdir)/scintilla/src/LexInno.cxx
+       $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexInno.cxx
+
 stcdll_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexKix.cxx
 
@@ -547,6 +563,9 @@ stcdll_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
 stcdll_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexNsis.cxx
 
+stcdll_LexOpal.o: $(srcdir)/scintilla/src/LexOpal.cxx
+       $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexOpal.cxx
+
 stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexOthers.cxx
 
@@ -589,6 +608,12 @@ stcdll_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
 stcdll_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSpecman.cxx
 
+stcdll_LexSpice.o: $(srcdir)/scintilla/src/LexSpice.cxx
+       $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexSpice.cxx
+
+stcdll_LexTCL.o: $(srcdir)/scintilla/src/LexTCL.cxx
+       $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTCL.cxx
+
 stcdll_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
        $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/scintilla/src/LexTeX.cxx
 
@@ -652,6 +677,9 @@ stclib_CallTip.o: $(srcdir)/scintilla/src/CallTip.cxx
 stclib_CellBuffer.o: $(srcdir)/scintilla/src/CellBuffer.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CellBuffer.cxx
 
+stclib_CharClassify.o: $(srcdir)/scintilla/src/CharClassify.cxx
+       $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/CharClassify.cxx
+
 stclib_ContractionState.o: $(srcdir)/scintilla/src/ContractionState.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/ContractionState.cxx
 
@@ -754,6 +782,9 @@ stclib_LexHTML.o: $(srcdir)/scintilla/src/LexHTML.cxx
 stclib_LexHaskell.o: $(srcdir)/scintilla/src/LexHaskell.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexHaskell.cxx
 
+stclib_LexInno.o: $(srcdir)/scintilla/src/LexInno.cxx
+       $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexInno.cxx
+
 stclib_LexKix.o: $(srcdir)/scintilla/src/LexKix.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexKix.cxx
 
@@ -784,6 +815,9 @@ stclib_LexMetapost.o: $(srcdir)/scintilla/src/LexMetapost.cxx
 stclib_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexNsis.cxx
 
+stclib_LexOpal.o: $(srcdir)/scintilla/src/LexOpal.cxx
+       $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexOpal.cxx
+
 stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexOthers.cxx
 
@@ -826,6 +860,12 @@ stclib_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx
 stclib_LexSpecman.o: $(srcdir)/scintilla/src/LexSpecman.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSpecman.cxx
 
+stclib_LexSpice.o: $(srcdir)/scintilla/src/LexSpice.cxx
+       $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexSpice.cxx
+
+stclib_LexTCL.o: $(srcdir)/scintilla/src/LexTCL.cxx
+       $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTCL.cxx
+
 stclib_LexTeX.o: $(srcdir)/scintilla/src/LexTeX.cxx
        $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/scintilla/src/LexTeX.cxx