From 33c4a227d2ab58353afc6f09823a0a0aa0249575 Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sat, 13 May 2017 22:31:14 +0530
Subject: Make Makefile generic

---
 Makefile         |  3 +--
 Makefile.generic | 51 ---------------------------------------------------
 Makefile.native  | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 nnn.c            |  4 +++-
 4 files changed, 57 insertions(+), 54 deletions(-)
 delete mode 100644 Makefile.generic
 create mode 100644 Makefile.native

diff --git a/Makefile b/Makefile
index efd9555..2394a47 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.generic
deleted file mode 100644
index c4e8fdd..0000000
--- a/Makefile.generic
+++ /dev/null
@@ -1,51 +0,0 @@
-VERSION = 1.0
-
-PREFIX = /usr/local
-MANPREFIX = $(PREFIX)/share/man
-
-CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter
-LDLIBS = -lreadline
-ifeq ($(shell uname), Darwin)
-    LDLIBS += -lncurses
-else
-    LDLIBS += -lncursesw
-endif
-
-DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
-LOCALCONFIG = config.h
-SRC = nnn.c
-BIN = nnn
-PLAYER = nlay
-
-all: $(BIN) $(PLAYER)
-
-$(LOCALCONFIG): config.def.h
-	cp config.def.h $@
-
-$(SRC): $(LOCALCONFIG)
-
-$(BIN): $(SRC)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
-	strip $@
-
-install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
-	cp -f $(PLAYER) $(DESTDIR)$(PREFIX)/bin
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	cp -f $(BIN).1 $(DESTDIR)$(MANPREFIX)/man1
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN)
-	rm -f $(DESTDIR)$(PREFIX)/bin/$(PLAYER)
-	rm -f $(DESTDIR)$(MANPREFIX)/man1/$(BIN).1
-
-dist:
-	mkdir -p nnn-$(VERSION)
-	cp $(DISTFILES) nnn-$(VERSION)
-	tar -cf nnn-$(VERSION).tar nnn-$(VERSION)
-	gzip nnn-$(VERSION).tar
-	rm -rf nnn-$(VERSION)
-
-clean:
-	rm -f $(BIN) nnn-$(VERSION).tar.gz
diff --git a/Makefile.native b/Makefile.native
new file mode 100644
index 0000000..310f138
--- /dev/null
+++ b/Makefile.native
@@ -0,0 +1,53 @@
+VERSION = 1.1
+
+PREFIX = /usr/local
+MANPREFIX = $(PREFIX)/share/man
+
+CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter
+LDLIBS = -lreadline
+
+ifeq ($(shell pkg-config ncursesw && echo 1),1)
+	CFLAGS += $(shell pkg-config --cflags ncursesw)
+	LDLIBS += $(shell pkg-config --libs   ncursesw)
+else
+	LDLIBS += -lncurses
+endif
+
+DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
+LOCALCONFIG = config.h
+SRC = nnn.c
+BIN = nnn
+PLAYER = nlay
+
+all: $(BIN) $(PLAYER)
+
+$(LOCALCONFIG): config.def.h
+	cp config.def.h $@
+
+$(SRC): $(LOCALCONFIG)
+
+$(BIN): $(SRC)
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+	strip $@
+
+install: all
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+	cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
+	cp -f $(PLAYER) $(DESTDIR)$(PREFIX)/bin
+	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+	cp -f $(BIN).1 $(DESTDIR)$(MANPREFIX)/man1
+
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN)
+	rm -f $(DESTDIR)$(PREFIX)/bin/$(PLAYER)
+	rm -f $(DESTDIR)$(MANPREFIX)/man1/$(BIN).1
+
+dist:
+	mkdir -p nnn-$(VERSION)
+	cp $(DISTFILES) nnn-$(VERSION)
+	tar -cf nnn-$(VERSION).tar nnn-$(VERSION)
+	gzip nnn-$(VERSION).tar
+	rm -rf nnn-$(VERSION)
+
+clean:
+	rm -f $(BIN) nnn-$(VERSION).tar.gz
diff --git a/nnn.c b/nnn.c
index 1bd9a67..7d93893 100644
--- a/nnn.c
+++ b/nnn.c
@@ -28,7 +28,9 @@
 #include <wchar.h>
 #include <readline/readline.h>
 
-#define __USE_XOPEN_EXTENDED
+#ifndef __USE_XOPEN_EXTENDED
+#define __USE_XOPEN_EXTENDED 1
+#endif
 #include <ftw.h>
 
 #ifdef DEBUG
-- 
cgit v1.2.3-70-g09d2