new files added

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

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index 3deb9ba6ba53535539a8e3444a2686457b39f7ba..9df25a3db22d00b80ef3e735339d44554e906a0a 100644 (file)
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -9,13 +9,13 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 
 scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla
 top_builddir = ../../..
 
 scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla

-libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src
+libsrc_dir = contrib/src/stc/scintilla/src:$(top_srcdir)/contrib/src/stc

 
 

-TARGET_LIBNAME=libstc
+TARGET_LIBNAME=lib@WX_LIBRARY_BASENAME@_stc-@WX_RELEASE@

 
 

-LIBVERSION_CURRENT=1
-LIBVERSION_REVISION=0
-LIBVERSION_AGE=0
+LIBVERSION_CURRENT=@WX_CURRENT@
+LIBVERSION_REVISION=@WX_REVISION@
+LIBVERSION_AGE=@WX_AGE@

 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=stc
 
 HEADER_PATH=$(top_srcdir)/contrib/include/wx
 HEADER_SUBDIR=stc


@@ -35,13 +35,21 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
         KeyWords.o             \
        LexAVE.o                \
        LexAda.o                \
         KeyWords.o             \
        LexAVE.o                \
        LexAda.o                \

+       LexAsm.o                \
+       LexBaan.o               \
+       LexBullant.o            \
+       LexMatlab.o             \

        LexCPP.o                \
        LexConf.o               \
        LexCPP.o                \
        LexConf.o               \

+       LexCrontab.o            \
+       LexCSS.o                \

        LexEiffel.o             \
        LexEiffel.o             \

+       LexFortran.o            \

        LexHTML.o               \
        LexLisp.o               \
        LexLua.o                \
        LexOthers.o             \
        LexHTML.o               \
        LexLisp.o               \
        LexLua.o                \
        LexOthers.o             \

+       LexPOV.o                \

        LexPascal.o             \
        LexPerl.o               \
        LexPython.o             \
        LexPascal.o             \
        LexPerl.o               \
        LexPython.o             \


@@ -53,13 +61,16 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
        RESearch.o              \
         ScintillaBase.o                \
         Style.o                        \
        RESearch.o              \
         ScintillaBase.o                \
         Style.o                        \

+       StyleContext.o          \

        UniConversion.o         \
         ViewStyle.o            \
        WindowAccessor.o        \
        UniConversion.o         \
         ViewStyle.o            \
        WindowAccessor.o        \

+       XPM.o                   \
+

 
 DEPFILES=$(OBJECTS:.o=.d)
 
 
 DEPFILES=$(OBJECTS:.o=.d)
 

-APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include
+APPEXTRADEFS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/contrib/include

 
 include $(top_builddir)/src/makelib.env
 
 
 include $(top_builddir)/src/makelib.env