Don't do the wx cleanup if wxPython didn't do the initialization.

[wxWidgets.git] / src / stc / makefile.g95

diff --git a/src/stc/makefile.g95 b/src/stc/makefile.g95
index b6d802ecd93ffac5387e74db6b003ed43c6b4c5b..4ae99521f58955ba58d28045ce8ac48b47da85f0 100644 (file)
--- a/src/stc/makefile.g95
+++ b/src/stc/makefile.g95
@@ -7,28 +7,52 @@ WXDIR = ../../..
 
 SCINTILLA=$(WXDIR)/contrib/src/stc/scintilla
 S=$(SCINTILLA)/src
-EXTRAINC=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)/contrib/include
+EXTRAINC=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S) -I. -I$(WXDIR)/contrib/include
 
 OBJECTS = \
-       $(S)/Accessor.$(OBJSUFF) \
-       $(S)/AutoComplete.$(OBJSUFF) \
-       $(S)/CallTip.$(OBJSUFF) \
-       $(S)/CellBuffer.$(OBJSUFF) \
-       $(S)/ContractionState.$(OBJSUFF)\
-       $(S)/Document.$(OBJSUFF) \
-       $(S)/Editor.$(OBJSUFF) \
-       $(S)/Indicator.$(OBJSUFF) \
-       $(S)/KeyMap.$(OBJSUFF) \
-       $(S)/KeyWords.$(OBJSUFF) \
-       $(S)/LineMarker.$(OBJSUFF) \
-       $(S)/PropSet.$(OBJSUFF) \
-       $(S)/ScintillaBase.$(OBJSUFF) \
-       $(S)/Style.$(OBJSUFF) \
-       $(S)/ViewStyle.$(OBJSUFF) \
+        $(S)/AutoComplete.$(OBJSUFF)   \
+        $(S)/CallTip.$(OBJSUFF)                \
+        $(S)/CellBuffer.$(OBJSUFF)     \
+        $(S)/ContractionState.$(OBJSUFF) \
+        $(S)/Document.$(OBJSUFF)       \
+       $(S)/DocumentAccessor.$(OBJSUFF) \
+        $(S)/Editor.$(OBJSUFF)         \
+        $(S)/Indicator.$(OBJSUFF)      \
+        $(S)/KeyMap.$(OBJSUFF)         \
+        $(S)/KeyWords.$(OBJSUFF)       \
+       $(S)/LexAVE.$(OBJSUFF)          \
+       $(S)/LexAda.$(OBJSUFF)          \
+       $(S)/LexBaan.$(OBJSUFF)         \
+       $(S)/LexBullant.$(OBJSUFF)      \
+       $(S)/LexMatlab.$(OBJSUFF)       \
+       $(S)/LexCPP.$(OBJSUFF)          \
+       $(S)/LexConf.$(OBJSUFF)         \
+       $(S)/LexCrontab.$(OBJSUFF)      \
+       $(S)/LexEiffel.$(OBJSUFF)       \
+       $(S)/LexHTML.$(OBJSUFF)         \
+       $(S)/LexLisp.$(OBJSUFF)         \
+       $(S)/LexLua.$(OBJSUFF)          \
+       $(S)/LexOthers.$(OBJSUFF)       \
+       $(S)/LexPascal.$(OBJSUFF)       \
+       $(S)/LexPerl.$(OBJSUFF)         \
+       $(S)/LexPython.$(OBJSUFF)       \
+       $(S)/LexRuby.$(OBJSUFF)         \
+       $(S)/LexSQL.$(OBJSUFF)          \
+       $(S)/LexVB.$(OBJSUFF)           \
+        $(S)/LineMarker.$(OBJSUFF)     \
+        $(S)/PropSet.$(OBJSUFF)                \
+       $(S)/RESearch.$(OBJSUFF)        \
+        $(S)/ScintillaBase.$(OBJSUFF)  \
+        $(S)/Style.$(OBJSUFF)          \
+       $(S)/StyleContext.$(OBJSUFF)    \
+       $(S)/UniConversion.$(OBJSUFF)   \
+        $(S)/ViewStyle.$(OBJSUFF)      \
+       $(S)/WindowAccessor.$(OBJSUFF)  \
+       \
        PlatWX.$(OBJSUFF) \
        ScintillaWX.$(OBJSUFF) \
        stc.$(OBJSUFF)
 
-LIBTARGET = $(WXDIR)/contrib/lib/libstc.a
+LIBTARGET = $(WXDIR)/lib/libstc.a
 
 include $(WXDIR)/src/makelib.g95
\ No newline at end of file