nnn

commit 9a4c4467600d02a445b5055d3278052b93395970
parent 3c612fe64d5814e4749ab5c0db0da1173489435d
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date:   Wed,  5 Jul 2017 08:38:34 +0530

Retire config.def.h, unify Makefiles

Diffstat:
M
Makefile
 | 
8
++------
M
Makefile.native
 | 
12
++++--------
R
config.def.h -> config.h
 | 
0

3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
@@ -13,18 +13,14 @@ else
 	LDLIBS += -lncurses
 endif
 
-DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
-LOCALCONFIG = config.h
+DISTFILES = nlay nnn.c config.h nnn.1 Makefile README.md LICENSE
 SRC = nnn.c
 BIN = nnn
 PLAYER = nlay
 
 all: $(BIN) $(PLAYER)
 
-$(LOCALCONFIG): config.def.h
-	cp config.def.h $@
-
-$(SRC): $(LOCALCONFIG)
+$(SRC): config.h
 
 $(BIN): $(SRC)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
diff --git a/Makefile.native b/Makefile.native
@@ -1,6 +1,6 @@
 VERSION = 1.2
 
-PREFIX = /usr/local
+PREFIX ?= /usr/local
 MANPREFIX = $(PREFIX)/share/man
 
 CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter
@@ -13,21 +13,17 @@ else
 	LDLIBS += -lncurses
 endif
 
-DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
-LOCALCONFIG = config.h
+DISTFILES = nlay nnn.c config.h nnn.1 Makefile README.md LICENSE
 SRC = nnn.c
 BIN = nnn
 PLAYER = nlay
 
 all: $(BIN) $(PLAYER)
 
-$(LOCALCONFIG): config.def.h
-	cp config.def.h $@
-
-$(SRC): $(LOCALCONFIG)
+$(SRC): config.h
 
 $(BIN): $(SRC)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
 	strip $@
 
 install: all
diff --git a/config.def.h b/config.h