SOURCES: scintilla-make.patch - updated for 1.76
shadzik
shadzik at pld-linux.org
Sun Mar 30 15:27:07 CEST 2008
Author: shadzik Date: Sun Mar 30 13:27:07 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.76
---- Files affected:
SOURCES:
scintilla-make.patch (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SOURCES/scintilla-make.patch
diff -u SOURCES/scintilla-make.patch:1.11 SOURCES/scintilla-make.patch:1.12
--- SOURCES/scintilla-make.patch:1.11 Wed Feb 21 03:56:07 2007
+++ SOURCES/scintilla-make.patch Sun Mar 30 15:27:02 2008
@@ -1,5 +1,5 @@
---- scintilla/gtk/makefile.orig 2006-12-13 01:19:17.000000000 +0100
-+++ scintilla/gtk/makefile 2007-02-21 02:20:34.439128201 +0100
+--- scintilla/gtk/makefile.orig 2008-01-18 23:18:13.000000000 +0100
++++ scintilla/gtk/makefile 2008-03-30 14:57:40.000000000 +0200
@@ -7,7 +7,7 @@
# To force GTK+ 2 build, define GTK2 on the make command line.
# To force GTK+ 1 build, define GTK1 on the make command line.
@@ -32,52 +32,54 @@
# If explicit setting of GTK1 or GTK2 then use that else look for
# pkg-config which is an OK indication that GTK2 is available
ifdef GTK2
--CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+-CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
-MARSHALLER=scintilla-marshal.o
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
+MARSHALLER=scintilla-marshal.lo
else
ifdef GTK1
- CONFIGFLAGS=gtk-config --cflags
+ CONFIGFLAGS=$(shell gtk-config --cflags)
else
ifneq (,$(findstring /,$(shell whereis pkg-config)))
--CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+-CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
-MARSHALLER=scintilla-marshal.o
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
+MARSHALLER=scintilla-marshal.lo
else
- CONFIGFLAGS=gtk-config --cflags
+ CONFIGFLAGS=$(shell gtk-config --cflags)
endif
-@@ -59,37 +59,46 @@
- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+@@ -60,37 +60,47 @@
.c.o:
- $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
+ $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
+
+.cxx.lo:
+ libtool --tag=CXX --mode=compile $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+.c.lo:
-+ libtool --tag=CC --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
-
++ libtool --tag=CC --mode=compile $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
++
#++Autogenerated -- run src/LexGen.py to regenerate
#**LEXOBJS=\\\n\(\*.o \)
LEXOBJS=\
--LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexAU3.o LexAVE.o LexBaan.o LexBash.o \
--LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexConf.o LexCPP.o LexCrontab.o \
--LexCsound.o LexCSS.o LexD.o LexEiffel.o LexErlang.o LexEScript.o LexFlagship.o \
--LexForth.o LexFortran.o LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o \
--LexLisp.o LexLout.o LexLua.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o \
--LexMSSQL.o LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o \
--LexPOV.o LexPS.o LexPython.o LexRebol.o LexRuby.o LexScriptol.o LexSmalltalk.o \
--LexSpecman.o LexSpice.o LexSQL.o LexTADS3.o LexTCL.o LexTeX.o LexVB.o \
--LexVerilog.o LexVHDL.o LexYAML.o
-+LexAda.lo LexAPDL.lo LexAsm.lo LexAsn1.lo LexAU3.lo LexAVE.lo LexBaan.lo LexBash.lo \
-+LexBasic.lo LexBullant.lo LexCaml.lo LexCLW.lo LexConf.lo LexCPP.lo LexCrontab.lo \
-+LexCsound.lo LexCSS.lo LexD.lo LexEiffel.lo LexErlang.lo LexEScript.lo LexFlagship.lo \
-+LexForth.lo LexFortran.lo LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexInno.lo LexKix.lo \
-+LexLisp.lo LexLout.lo LexLua.lo LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo \
-+LexMSSQL.lo LexNsis.lo LexOpal.lo LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo \
-+LexPOV.lo LexPS.lo LexPython.lo LexRebol.lo LexRuby.lo LexScriptol.lo LexSmalltalk.lo \
-+LexSpecman.lo LexSpice.lo LexSQL.lo LexTADS3.lo LexTCL.lo LexTeX.lo LexVB.lo \
-+LexVerilog.lo LexVHDL.lo LexYAML.lo
+-LexAbaqus.o LexAda.o LexAPDL.o LexAsm.o LexAsn1.o LexASY.o LexAU3.o LexAVE.o \
+-LexBaan.o LexBash.o LexBasic.o LexBullant.o LexCaml.o LexCLW.o LexCmake.o \
+-LexConf.o LexCPP.o LexCrontab.o LexCsound.o LexCSS.o LexD.o LexEiffel.o \
+-LexErlang.o LexEScript.o LexFlagship.o LexForth.o LexFortran.o LexGAP.o \
+-LexGui4Cli.o LexHaskell.o LexHTML.o LexInno.o LexKix.o LexLisp.o LexLout.o \
+-LexLua.o LexMagik.o LexMatlab.o LexMetapost.o LexMMIXAL.o LexMPT.o LexMSSQL.o \
+-LexNsis.o LexOpal.o LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o \
+-LexPOV.o LexPowerShell.o LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o \
+-LexRuby.o LexScriptol.o LexSmalltalk.o LexSpecman.o LexSpice.o LexSQL.o \
+-LexTADS3.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
++LexAbaqus.lo LexAda.lo LexAPDL.lo LexAsm.lo LexAsn1.lo LexASY.lo LexAU3.lo LexAVE.lo \
++LexBaan.lo LexBash.lo LexBasic.lo LexBullant.lo LexCaml.lo LexCLW.lo LexCmake.lo \
++LexConf.lo LexCPP.lo LexCrontab.lo LexCsound.lo LexCSS.lo LexD.lo LexEiffel.lo \
++LexErlang.lo LexEScript.lo LexFlagship.lo LexForth.lo LexFortran.lo LexGAP.lo \
++LexGui4Cli.lo LexHaskell.lo LexHTML.lo LexInno.lo LexKix.lo LexLisp.lo LexLout.lo \
++LexLua.lo LexMagik.lo LexMatlab.lo LexMetapost.lo LexMMIXAL.lo LexMPT.lo LexMSSQL.lo \
++LexNsis.lo LexOpal.lo LexOthers.lo LexPascal.lo LexPB.lo LexPerl.lo LexPLM.lo \
++LexPOV.lo LexPowerShell.lo LexProgress.lo LexPS.lo LexPython.lo LexR.lo LexRebol.lo \
++LexRuby.lo LexScriptol.lo LexSmalltalk.lo LexSpecman.lo LexSpice.lo LexSQL.lo \
++LexTADS3.lo LexTCL.lo LexTeX.lo LexVB.lo LexVerilog.lo LexVHDL.lo LexYAML.lo
#--Autogenerated -- end of automatically generated section
all: $(COMPLIB)
@@ -87,18 +89,18 @@
+ rm -f *.o *.lo $(COMPLIB)
deps:
- $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx >deps.mak
+ $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
-- CharClassify.o Document.o CallTip.o \
+- CharClassify.o Decoration.o Document.o CallTip.o \
- ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
-- KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
-- RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+- KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
+- RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+$(COMPLIB): DocumentAccessor.lo WindowAccessor.lo KeyWords.lo StyleContext.lo \
-+ CharClassify.lo Document.lo CallTip.lo \
++ CharClassify.lo Decoration.lo Document.lo CallTip.lo \
+ ScintillaBase.lo ContractionState.lo Editor.lo ExternalLexer.lo PropSet.lo PlatGTK.lo \
-+ KeyMap.lo LineMarker.lo ScintillaGTK.lo CellBuffer.lo ViewStyle.lo \
-+ RESearch.lo Style.lo Indicator.lo AutoComplete.lo UniConversion.lo XPM.lo \
++ KeyMap.lo LineMarker.lo PositionCache.lo ScintillaGTK.lo CellBuffer.lo ViewStyle.lo \
++ RESearch.lo RunStyles.lo Style.lo Indicator.lo AutoComplete.lo UniConversion.lo XPM.lo \
$(MARSHALLER) $(LEXOBJS)
- $(AR) rc $@ $^
- $(RANLIB) $@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/scintilla-make.patch?r1=1.11&r2=1.12&f=u
More information about the pld-cvs-commit
mailing list