Compatibility with makefile conventions: use CXX for C++ compiler and CC for

C compiler.
Allow overriding file deletion command on command line so that 'rm' can be used
when cross-compiling from Unix to Windows.

2 files changed, 15 insertions, 16 deletions

diff --git a/gtk/makefile b/gtk/makefile
index dfd3aff8a..5bf298602 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -8,15 +8,15 @@
 
 .SUFFIXES: .cxx .c .o .h .a
 ifdef CLANG
-CC = clang++
-CCOMP = clang
+CXX = clang++
+CC = clang
 # 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
-CC = g++
-CCOMP = gcc
+CXX = g++
+CC = gcc
 endif
 AR = ar
 RANLIB = touch
@@ -75,9 +75,9 @@ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
 
 .cxx.o:
-	$(CC) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
 .c.o:
-	$(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
+	$(CC) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
 
 LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
 
@@ -90,7 +90,7 @@ analyze:
 	clang --analyze $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx
 
 deps:
-	$(CC) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+	$(CXX) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
 
 $(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \
 	CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o CaseConvert.o CaseFolder.o \
diff --git a/win32/makefile b/win32/makefile
index 9ddfd594a..d4a39d278 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -5,8 +5,7 @@
 # be needed to use other compilers.
 
 .SUFFIXES: .cxx
-CC = g++
-DEL = del /q
+DEL ?= del /q
 
 COMPONENT = ../bin/Scintilla.dll
 LEXCOMPONENT = ../bin/SciLexer.dll
@@ -36,7 +35,7 @@ STRIPFLAG=-s
 endif
 
 .cxx.o:
-	$(CC) $(CXXFLAGS) -c $<
+	$(CXX) $(CXXFLAGS) -c $<
 
 ALL:	$(COMPONENT) $(LEXCOMPONENT) $(LEXLIB) ScintillaWinS.o
 
@@ -47,7 +46,7 @@ analyze:
 	clang --analyze -D DISABLE_D2D $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx
 
 deps:
-	$(CC) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak
+	$(CXX) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak
 
 LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
 
@@ -84,7 +83,7 @@ BASEOBJS = \
 SOBJS = ScintillaWin.o ScintillaBase.o $(BASEOBJS)
 
 $(COMPONENT): $(SOBJS) Scintilla.def
-	$(CC) $(LDFLAGS) -o $@ $(STRIPFLAG) $(SOBJS) $(CXXFLAGS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(SOBJS) $(CXXFLAGS) $(LIBS)
 
 LOBJS = \
 	Accessor.o \
@@ -100,7 +99,7 @@ LOBJS = \
 	$(BASEOBJS) \
 	$(LEXOBJS)
 $(LEXCOMPONENT): $(LOBJS) Scintilla.def
-	$(CC) $(LDFLAGS) -o $@ $(STRIPFLAG) $(LOBJS) $(CXXFLAGS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(LOBJS) $(CXXFLAGS) $(LIBS)
 
 $(LEXLIB): $(LEXOBJS)
 	$(AR) rc $@ $^
@@ -145,13 +144,13 @@ ScintillaWinS.o: ScintillaWin.cxx Platform.h \
  CaseConvert.h CaseFolder.h
 
 ScintillaBaseL.o:
-	$(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
+	$(CXX) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
 
 ScintillaWinS.o:
-	$(CC) $(CXXFLAGS) -D STATIC_BUILD -c $< -o $@
+	$(CXX) $(CXXFLAGS) -D STATIC_BUILD -c $< -o $@
 
 ScintillaWinL.o:
-	$(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
+	$(CXX) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
 
 ScintRes.o:	ScintRes.rc
 	windres ScintRes.rc $@