aboutsummaryrefslogtreecommitdiffhomepage
path: root/gtk
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-03-08 18:22:00 +1100
committerNeil <nyamatongwe@gmail.com>2018-03-08 18:22:00 +1100
commit492076b58d09387ab9c2f60eaef364a6a65c4c28 (patch)
treeb8c2a9bbf974d5d588bae807b2a2d144116c7b6a /gtk
parentfede631dfa75dd8518bbde5b845a9da7d133ce24 (diff)
downloadscintilla-mirror-492076b58d09387ab9c2f60eaef364a6a65c4c28.tar.gz
Backport: Create static library libscintilla.a or libscintilla.lib on Windows.
Stop creating Lexers.a static library. Harmonize make files. Backport of changeset 6477:a65186aab9f9.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/makefile b/gtk/makefile
index db7ae1c2d..2ab48417e 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -6,9 +6,10 @@
# Builds for GTK+ 2 and no longer supports GTK+ 1.
# Also works with ming32-make on Windows.
+.SUFFIXES: .cxx .c .o .h .a .list
+
srcdir ?= .
-.SUFFIXES: .cxx .c .o .h .a .list
ifdef CLANG
CXX = clang++
CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
@@ -98,6 +99,9 @@ MARSHALLER=scintilla-marshal.o
all: $(COMPLIB)
+clean:
+ $(DEL) *.o $(COMPLIB) *.plist
+
.cxx.o:
$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
$(MARSHALLER): scintilla-marshal.c
@@ -115,9 +119,6 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
-clean:
- $(DEL) *.o $(COMPLIB) *.plist
-
analyze:
clang --analyze $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx $(srcdir)/../lexlib/*.cxx $(srcdir)/../lexers/*.cxx