X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/458425003481da3dde531a9677014b07070b7095..d1a6e2b7a103d761fbc15e0e9c1c20ab53a849d9:/contrib/src/stc/Makefile.in diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index d4347e9b39..7405600bd6 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -22,6 +22,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ LDFLAGS = @LDFLAGS@ +LIBPREFIX = @LIBPREFIX@ LN_S = @LN_S@ PIC_FLAG = @PIC_FLAG@ RANLIB = @RANLIB@ @@ -41,13 +42,12 @@ top_srcdir = @top_srcdir@ ### Variables: ### +DESTDIR = LIBDIRNAME = $(top_builddir)lib -STCDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ +STCDLL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -DWXUSINGDLL \ - -DWXMAKINGDLL_STC $(CXXFLAGS) $(PIC_FLAG) + -DWXMAKINGDLL_STC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ stcdll_PlatWX.o \ stcdll_ScintillaWX.o \ @@ -79,14 +79,18 @@ STCDLL_OBJECTS = \ stcdll_LexLisp.o \ stcdll_LexLout.o \ stcdll_LexLua.o \ + stcdll_LexMMIXAL.o \ stcdll_LexMatlab.o \ + stcdll_LexNsis.o \ stcdll_LexOthers.o \ stcdll_LexPOV.o \ + stcdll_LexPS.o \ stcdll_LexPascal.o \ stcdll_LexPerl.o \ stcdll_LexPython.o \ stcdll_LexRuby.o \ stcdll_LexSQL.o \ + stcdll_LexScriptol.o \ stcdll_LexVB.o \ stcdll_LineMarker.o \ stcdll_PropSet.o \ @@ -98,11 +102,10 @@ STCDLL_OBJECTS = \ stcdll_ViewStyle.o \ stcdll_WindowAccessor.o \ stcdll_XPM.o -STCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ - $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ +STCLIB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir)/../../include -I$(srcdir)/scintilla/include \ - -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CXXFLAGS) + -I$(srcdir)/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS $(CPPFLAGS) \ + $(CXXFLAGS) STCLIB_OBJECTS = \ stclib_PlatWX.o \ stclib_ScintillaWX.o \ @@ -134,14 +137,18 @@ STCLIB_OBJECTS = \ stclib_LexLisp.o \ stclib_LexLout.o \ stclib_LexLua.o \ + stclib_LexMMIXAL.o \ stclib_LexMatlab.o \ + stclib_LexNsis.o \ stclib_LexOthers.o \ stclib_LexPOV.o \ + stclib_LexPS.o \ stclib_LexPascal.o \ stclib_LexPerl.o \ stclib_LexPython.o \ stclib_LexRuby.o \ stclib_LexSQL.o \ + stclib_LexScriptol.o \ stclib_LexVB.o \ stclib_LineMarker.o \ stclib_PropSet.o \ @@ -153,6 +160,7 @@ STCLIB_OBJECTS = \ stclib_ViewStyle.o \ stclib_WindowAccessor.o \ stclib_XPM.o +WX_VERSION = 2.5.1 ### Conditionally set variables: ### @@ -169,18 +177,11 @@ STCLIB_OBJECTS = \ @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) -@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250 +@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = @COND_UNICODE_1@WXUNICODEFLAG = u @COND_WXUNIV_1@WXUNIVNAME = univ -@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib -@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg -@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc -@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png -@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex -@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff -@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ @COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ @@ -213,32 +214,33 @@ COND_SHARED_1___stcdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_SHARED_1@__stcdll___depname = $(COND_SHARED_1___stcdll___depname) COND_PLATFORM_WIN32_1___stcdll___importlib = \ - -Wl,--out-implib,$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_PLATFORM_WIN32_1@__stcdll___importlib = $(COND_PLATFORM_WIN32_1___stcdll___importlib) COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \ $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) @COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd) @COND_PLATFORM_MACOSX_1@__stcdll___macver = \ -@COND_PLATFORM_MACOSX_1@ -compatibility_version 2.5 -current_version 2.5.0 +@COND_PLATFORM_MACOSX_1@ -compatibility_version $(WX_VERSION) \ +@COND_PLATFORM_MACOSX_1@ -current_version $(WX_VERSION) COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)) @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2); \ $(LN_S) \ $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) \ - libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd) COND_USE_SOVERLINUX_1___stcdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) @@ -247,17 +249,17 @@ COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \ $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags) @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_SOVERSION_1@__stcdll___targetsuf3 \ -@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@ = .$(SO_SUFFIX).0.0.0 +@COND_PLATFORM_MACOSX_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_SOVERSION_0@__stcdll___targetsuf3 = .$(SO_SUFFIX) COND_SHARED_0___stclib___depname = \ - $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a + $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__stclib___depname = $(COND_SHARED_0___stclib___depname) ### Targets: ### @@ -268,37 +270,38 @@ clean: rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) - rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf2) + rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_stcdll___depname) $(__install_stclib___depname) - $(INSTALL_DIR) $(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir) for f in wx/stc/stc.h; do \ - if test ! -d $(includedir)/`dirname $$f` ; then \ - $(INSTALL_DIR) $(includedir)/`dirname $$f`; \ + if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ + $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ fi; \ - $(INSTALL_DATA) $(srcdir)/../../include//$$f $(includedir)/$$f; \ + $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \ done install-strip: install - $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) + $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) @COND_SHARED_1@install_stcdll: -@COND_SHARED_1@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir) -@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(libdir) -@COND_SHARED_1@ (cd $(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) +@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir) +@COND_SHARED_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) $(DESTDIR)$(libdir) +@COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd)) @COND_SHARED_0@install_stclib: -@COND_SHARED_0@ $(INSTALL_DIR) $(libdir) -@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(libdir) +@COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) +@COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir) @COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3): $(STCDLL_OBJECTS) -@COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(__stcdll___macver) $(__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) $(EXTRALIBS_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) $(__stcdll___macver) $(__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) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) +@COND_SHARED_1@ @COND_SHARED_1@ $(__stcdll___so_symlinks_cmd) stcdll_AutoComplete.o: $(srcdir)/scintilla/src/AutoComplete.cxx @@ -382,15 +385,24 @@ stcdll_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx stcdll_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< +stcdll_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx + $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + stcdll_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< +stcdll_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx + $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + stcdll_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< stcdll_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< +stcdll_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx + $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + stcdll_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< @@ -406,6 +418,9 @@ stcdll_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx stcdll_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< +stcdll_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx + $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< + stcdll_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< @@ -448,7 +463,7 @@ stcdll_XPM.o: $(srcdir)/scintilla/src/XPM.cxx stcdll_stc.o: $(srcdir)/stc.cpp $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: $(STCLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a: $(STCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(STCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ @@ -534,15 +549,24 @@ stclib_LexLout.o: $(srcdir)/scintilla/src/LexLout.cxx stclib_LexLua.o: $(srcdir)/scintilla/src/LexLua.cxx $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< +stclib_LexMMIXAL.o: $(srcdir)/scintilla/src/LexMMIXAL.cxx + $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + stclib_LexMatlab.o: $(srcdir)/scintilla/src/LexMatlab.cxx $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< +stclib_LexNsis.o: $(srcdir)/scintilla/src/LexNsis.cxx + $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + stclib_LexOthers.o: $(srcdir)/scintilla/src/LexOthers.cxx $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< stclib_LexPOV.o: $(srcdir)/scintilla/src/LexPOV.cxx $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< +stclib_LexPS.o: $(srcdir)/scintilla/src/LexPS.cxx + $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + stclib_LexPascal.o: $(srcdir)/scintilla/src/LexPascal.cxx $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< @@ -558,6 +582,9 @@ stclib_LexRuby.o: $(srcdir)/scintilla/src/LexRuby.cxx stclib_LexSQL.o: $(srcdir)/scintilla/src/LexSQL.cxx $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< +stclib_LexScriptol.o: $(srcdir)/scintilla/src/LexScriptol.cxx + $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $< + stclib_LexVB.o: $(srcdir)/scintilla/src/LexVB.cxx $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $<