aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2010-06-05 00:19:25 +0000
committernyamatongwe <devnull@localhost>2010-06-05 00:19:25 +0000
commitdc93a9042fb8b7fa7092ff8b90e203436ddfb6ba (patch)
treef7e90c9dc0f01acb9ed069a14a9f8036413a3b72
parent84f4c7237c7931df03b65174fd6a0ed96f3cc284 (diff)
downloadscintilla-mirror-dc93a9042fb8b7fa7092ff8b90e203436ddfb6ba.tar.gz
Using Make functions to avoid regenerating makefile when set of
lexers changed.
-rw-r--r--gtk/makefile17
-rw-r--r--src/LexGen.py1
2 files changed, 1 insertions, 17 deletions
diff --git a/gtk/makefile b/gtk/makefile
index d62c8f34b..f0bbc53ad 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -51,22 +51,7 @@ MARSHALLER=scintilla-marshal.o
.c.o:
$(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
-#++Autogenerated -- run src/LexGen.py to regenerate
-#**LEXOBJS=\\\n\(\*.o \)
-LEXOBJS=\
-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 \
-LexCOBOL.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 LexMarkdown.o LexMatlab.o LexMetapost.o \
-LexMMIXAL.o LexMPT.o LexMSSQL.o LexMySQL.o LexNimrod.o LexNsis.o LexOpal.o \
-LexOthers.o LexPascal.o LexPB.o LexPerl.o LexPLM.o LexPOV.o LexPowerPro.o \
-LexPowerShell.o LexProgress.o LexPS.o LexPython.o LexR.o LexRebol.o LexRuby.o \
-LexScriptol.o LexSmalltalk.o LexSML.o LexSorcus.o LexSpecman.o LexSpice.o \
-LexSQL.o LexTACL.o LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o \
-LexVHDL.o LexYAML.o
-#--Autogenerated -- end of automatically generated section
+LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../src/Lex*.cxx))))
all: $(COMPLIB)
diff --git a/src/LexGen.py b/src/LexGen.py
index c5ea8001c..7a7e1ace9 100644
--- a/src/LexGen.py
+++ b/src/LexGen.py
@@ -274,7 +274,6 @@ def RegenerateAll():
# Use Unix EOLs for gtk Makefiles so they work for Linux users when
# extracted from the Scintilla source ZIP (typically created on
# Windows).
- Regenerate(root + "scintilla/gtk/makefile", "#", LF, lexFiles)
Regenerate(root + "scintilla/macosx/makefile", "#", LF, lexFiles)
if os.path.exists(root + "scite"):
Regenerate(root + "scite/win32/makefile", "#", NATIVE, lexFiles, propFiles)