From 9a4c4467600d02a445b5055d3278052b93395970 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Wed, 5 Jul 2017 08:38:34 +0530 Subject: [PATCH] Retire config.def.h, unify Makefiles --- Makefile | 8 ++------ Makefile.native | 12 ++++-------- config.def.h => config.h | 0 3 files changed, 6 insertions(+), 14 deletions(-) rename config.def.h => config.h (100%) diff --git a/Makefile b/Makefile index f1aed0f9..5e87f4fe 100644 --- 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 index 8377972e..ab832de6 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 diff --git a/config.def.h b/config.h similarity index 100% rename from config.def.h rename to config.h -- 2.48.1