From 492076b58d09387ab9c2f60eaef364a6a65c4c28 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 8 Mar 2018 18:22:00 +1100
Subject: 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.
---
 gtk/makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'gtk/makefile')

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
 
-- 
cgit v1.2.3