From: Zhiming Wang <zmwangx@gmail.com>
Date: Mon, 3 Apr 2017 18:50:21 +0000 (-0400)
Subject: Allow custom CFLAGS and CPPFLAGS in Makefile
X-Git-Tag: v1.0~27^2~1
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=e758ff78e5294e4358a8208c58db9189a7059120;p=nnn.git

Allow custom CFLAGS and CPPFLAGS in Makefile

This is consistent with the fact that custom LDFLAGS are already allowed, and
for once, it makes warning options easier to control.

Also use automatic variables $@ and $^ consistently.
---

diff --git a/Makefile b/Makefile
index 02f46614..af8b10b2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,7 @@ VERSION = 0.6
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/man
 
-#CPPFLAGS = -DDEBUG
-#CFLAGS = -g
-CFLAGS = -O3 -march=native
+CFLAGS += -O3 -march=native
 LDLIBS = -lcurses
 
 DISTFILES = nnn.c config.def.h nnn.1 Makefile README.md LICENSE
@@ -21,8 +19,8 @@ $(LOCALCONFIG): config.def.h
 $(SRC): $(LOCALCONFIG)
 
 $(BIN): $(SRC)
-	$(CC) $(CFLAGS) -o $@ $(SRC) $(LDFLAGS) $(LDLIBS)
-	strip $(BIN)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+	strip $@
 
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin