From 33c4a227d2ab58353afc6f09823a0a0aa0249575 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Sat, 13 May 2017 22:31:14 +0530 Subject: [PATCH] Make Makefile generic --- Makefile | 3 +-- Makefile.generic => Makefile.native | 12 +++++++----- nnn.c | 4 +++- 3 files changed, 11 insertions(+), 8 deletions(-) rename Makefile.generic => Makefile.native (79%) diff --git a/Makefile b/Makefile index efd9555a..2394a477 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = 1.1 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man -CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter +CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter LDLIBS = -lreadline ifeq ($(shell pkg-config ncursesw && echo 1),1) @@ -13,7 +13,6 @@ else LDLIBS += -lncurses endif - DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE LOCALCONFIG = config.h SRC = nnn.c diff --git a/Makefile.generic b/Makefile.native similarity index 79% rename from Makefile.generic rename to Makefile.native index c4e8fdd0..310f138d 100644 --- a/Makefile.generic +++ b/Makefile.native @@ -1,14 +1,16 @@ -VERSION = 1.0 +VERSION = 1.1 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man -CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter +CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter LDLIBS = -lreadline -ifeq ($(shell uname), Darwin) - LDLIBS += -lncurses + +ifeq ($(shell pkg-config ncursesw && echo 1),1) + CFLAGS += $(shell pkg-config --cflags ncursesw) + LDLIBS += $(shell pkg-config --libs ncursesw) else - LDLIBS += -lncursesw + LDLIBS += -lncurses endif DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE diff --git a/nnn.c b/nnn.c index 1bd9a670..7d93893b 100644 --- a/nnn.c +++ b/nnn.c @@ -28,7 +28,9 @@ #include #include -#define __USE_XOPEN_EXTENDED +#ifndef __USE_XOPEN_EXTENDED +#define __USE_XOPEN_EXTENDED 1 +#endif #include #ifdef DEBUG