X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64a3ee5fd2926c3e5341af2e4d62925fddb90c43..211cc8dc907ee50ca6d383b8df16bba9a4d3ce2d:/src/stc/Makefile.in

diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in
index 3666daed78..9f1ebcf396 100644
--- a/src/stc/Makefile.in
+++ b/src/stc/Makefile.in
@@ -5,12 +5,11 @@
 # Version: $Id$
 ###############################################################################
 
-top_srcdir = @top_srcdir@
+top_srcdir = @top_srcdir@/..
 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
 
@@ -18,30 +17,40 @@ LIBVERSION_CURRENT=1
 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 \
-        Accessor.o	        \
-        AutoComplete.o	    \
-        CallTip.o	        \
-        CellBuffer.o	    \
-        ContractionState.o  \
-        Document.o	        \
-        Editor.o		    \
-        Indicator.o	        \
-        KeyMap.o		    \
-        KeyWords.o	        \
+	DocumentAccessor.o	\
 	LexCPP.o		\
 	LexHTML.o		\
+	LexLua.o		\
 	LexOthers.o		\
 	LexPerl.o		\
 	LexPython.o		\
 	LexSQL.o		\
 	LexVB.o			\
-        LineMarker.o	    \
+	UniConversion.o		\
+	WindowAccessor.o	\
+        AutoComplete.o	    	\
+        CallTip.o	        \
+        CellBuffer.o	    	\
+        ContractionState.o  	\
+        Document.o	        \
+        Editor.o		\
+        Indicator.o	        \
+        KeyMap.o		\
+        KeyWords.o	        \
+        LineMarker.o	    	\
         PropSet.o	        \
-        ScintillaBase.o	    \
+        ScintillaBase.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