diff options
| author |  Arun Prakash Jana <engineerarun@gmail.com> | 2017-07-05 08:38:34 +0530 |
|---|---|---|
| committer | Arun Prakash Jana <engineerarun@gmail.com> | 2017-07-05 08:38:34 +0530 |
| commit | 9a4c4467600d02a445b5055d3278052b93395970 (patch) | |
| tree | 7f4879e3b6c52038a39ad90058b2259dc227ed75 | |
| parent | 3c612fe64d5814e4749ab5c0db0da1173489435d (diff) | |
| download | nnn-9a4c4467600d02a445b5055d3278052b93395970.tar.gz | |
Retire config.def.h, unify Makefiles
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Makefile.native | 12 | ||||
| -rw-r--r-- | config.h (renamed from config.def.h) | 0 |
3 files changed, 6 insertions, 14 deletions
@@ -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 index 8377972..ab832de 100644 --- 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 |