Backport: Simplify makefile and use better variable names.

Accumulate BASE_FLAGS and DEFINES instead of using multiple variables.

Backport of changeset 7849:6d94e99d9847.

1 files changed, 26 insertions, 30 deletions

diff --git a/gtk/makefile b/gtk/makefile
index df3192c40..a050d21ce 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -10,17 +10,18 @@
 .SUFFIXES: .cxx .c .o .h .a .list
 
 srcdir ?= .
+basedir = $(srcdir)/..
 
+WARNINGS = -Wpedantic -Wall
 ifdef CLANG
 CXX = clang++
-CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register
 CC = clang
+WARNINGS += -Wno-deprecated-register
 # Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
 # thread also need to create Position Independent Executable -> search online documentation
 SANITIZE = address
 #SANITIZE = undefined
-else
-CXXWARNFLAGS = -Wall -pedantic
+BASE_FLAGS += -fsanitize=$(SANITIZE)
 endif
 ARFLAGS = rc
 RANLIB ?= ranlib
@@ -35,7 +36,7 @@ endif
 
 # Enable Position Independent Code except on Windows where it is the default so the flag produces a warning
 ifndef windir
-PICFLAGS = -fPIC
+BASE_FLAGS += -fPIC
 endif
 
 ifdef windir
@@ -44,35 +45,29 @@ DEL = del /q
 COMPLIB=$(srcdir)\..\bin\scintilla.a
 else
 DEL = rm -f
-COMPLIB=$(srcdir)/../bin/scintilla.a
+COMPLIB=$(basedir)/bin/scintilla.a
 endif
 
-vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
+vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
 vpath %.c $(srcdir)
-vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../lexlib $(srcdir)/../lexers
+vpath %.cxx $(srcdir) $(basedir)/src $(basedir)/lexlib $(basedir)/lexers
 
-INCLUDEDIRS=-I $(srcdir)/../include -I $(srcdir)/../src -I $(srcdir)/../lexlib
-CXXBASEFLAGS=$(CXXWARNFLAGS) $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS)
+INCLUDES=-I $(basedir)/include -I $(basedir)/src -I $(basedir)/lexlib
+DEFINES += -DGTK -DSCI_LEXER
+BASE_FLAGS += $(WARNINGS)
 
 ifdef NO_CXX11_REGEX
-REFLAGS=-DNO_CXX11_REGEX
+DEFINES += -DNO_CXX11_REGEX
 endif
 
-ifdef DEBUG
-ifdef CLANG
-CTFLAGS=-DDEBUG -g -fsanitize=$(SANITIZE) $(CXXBASEFLAGS)
-else
-CTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
-endif
-else
-CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)
-endif
+DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+BASE_FLAGS += $(if $(DEBUG),-g,-Os)
 
-CXXTFLAGS:=--std=gnu++0x $(CTFLAGS) $(REFLAGS)
+CXX_BASE_FLAGS =--std=gnu++0x $(BASE_FLAGS)
 ifdef LPEG_LEXER
-CXXTFLAGS+=-DLPEG_LEXER -I ../src/lua
+CXX_BASE_FLAGS += -DLPEG_LEXER -I ../src/lua
 LUA_CFLAGS:=-std=c99 -pedantic -Wall -I ../src/lua -DLUA_USE_POSIX -DLUA_USE_DLOPEN
-LUAOBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \
+LUA_OBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \
          llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
          ltable.o ltm.o lundump.o lvm.o lzio.o \
          lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o \
@@ -80,7 +75,8 @@ LUAOBJS:=lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o linit.o \
          lpcap.o lpcode.o lpprint.o lptree.o lpvm.o
 endif
 
-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+
+CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
 
 all: $(COMPLIB)
@@ -89,10 +85,10 @@ clean:
 	$(DEL) *.o $(COMPLIB) *.plist
 
 .cxx.o:
-	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
-$(MARSHALLER): scintilla-marshal.c
-	$(CC) $(CONFIGFLAGS) $(CTFLAGS) $(CFLAGS) -w -c $<
-$(LUAOBJS): %.o: ../lua/src/%.c
+	$(CXX) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) -c $<
+.c.o:
+	$(CC) $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(BASE_FLAGS) $(CFLAGS) -w -c $<
+$(LUA_OBJS): %.o: ../lua/src/%.c
 	$(CC) $(LUA_CFLAGS) $(CFLAGS) -c $<
 
 GLIB_GENMARSHAL = glib-genmarshal
@@ -103,10 +99,10 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal
 .list.c:
 	$(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@
 
-LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
+LEX_OBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
 
 analyze:
-	clang --analyze $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(srcdir)/../src/*.cxx $(srcdir)/../lexlib/*.cxx $(srcdir)/../lexers/*.cxx
+	clang --analyze $(DEFINES) $(INCLUDES) $(CONFIG_FLAGS) $(CXX_BASE_FLAGS) $(CXXFLAGS) $(srcdir)/*.cxx $(basedir)/src/*.cxx $(basedir)/lexlib/*.cxx $(basedir)/lexers/*.cxx
 
 depend deps.mak:
 	python DepGen.py
@@ -162,7 +158,7 @@ GTK_OBJS = \
 	ScintillaGTK.o \
 	ScintillaGTKAccessible.o
 
-$(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEXOBJS) $(LUAOBJS)
+$(COMPLIB): $(SRC_OBJS) $(LEXLIB_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS) $(LUA_OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 	$(RANLIB) $@