added 'name' to wxEditableListBox ctor

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

diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in
index 425ea48714f5230546d5cf07685096c0fc8e6193..9f1ebcf396303c5758e46ed2cf5f1839dadec91a 100644 (file)
--- a/contrib/src/stc/Makefile.in
+++ b/contrib/src/stc/Makefile.in
@@ -5,12 +5,11 @@
 # Version: $Id$
 ###############################################################################
 
 # Version: $Id$
 ###############################################################################
 

-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..

 top_builddir = ../../..
 
 top_builddir = ../../..
 

-this_dir = $(top_srcdir)/src/stc
-scintilla_dir=$(this_dir)/scintilla
-VPATH=$(this_dir)@PATH_IFS@$(scintilla_dir)/src # ':' for autoconf
+scintilla_dir = $(top_srcdir)/contrib/src/stc/scintilla
+libsrc_dir = contrib/src/stc@PATH_IFS@$(scintilla_dir)/src

 
 TARGET_LIBNAME=libstc
 
 
 TARGET_LIBNAME=libstc
 


@@ -18,23 +17,40 @@ LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0
 
 LIBVERSION_REVISION=0
 LIBVERSION_AGE=0
 

+HEADER_PATH=$(top_srcdir)/contrib/include/wx
+HEADER_SUBDIR=stc
+
+HEADERS=stc.h
+

 OBJECTS=PlatWX.o ScintillaWX.o stc.o \
 OBJECTS=PlatWX.o ScintillaWX.o stc.o \

-        Accessor.o             \
-        AutoComplete.o     \
+       DocumentAccessor.o      \
+       LexCPP.o                \
+       LexHTML.o               \
+       LexLua.o                \
+       LexOthers.o             \
+       LexPerl.o               \
+       LexPython.o             \
+       LexSQL.o                \
+       LexVB.o                 \
+       UniConversion.o         \
+       WindowAccessor.o        \
+        AutoComplete.o         \

         CallTip.o              \
         CallTip.o              \

-        CellBuffer.o       \
-        ContractionState.o  \
+        CellBuffer.o           \
+        ContractionState.o     \

         Document.o             \
         Document.o             \

-        Editor.o                   \
+        Editor.o               \

         Indicator.o            \
         Indicator.o            \

-        KeyMap.o                   \
+        KeyMap.o               \

         KeyWords.o             \
         KeyWords.o             \

-        LineMarker.o       \
+        LineMarker.o           \

         PropSet.o              \
         PropSet.o              \

-        ScintillaBase.o            \
+        ScintillaBase.o                \

         Style.o                        \
         Style.o                        \

-        ViewStyle.o
-        
-APPEXTRADEFS=-D__WX__ -DSCI_LEXER -I$(scintilla_dir)/src -I$(scintilla_dir)/include -I$(top_srcdir)/include
+        ViewStyle.o            \
+       PosRegExp.o             \
+
+
+APPEXTRADEFS=-D__WX__ -DSCI_LEXER -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