2 files changed, 10 insertions(+), 2 deletions(-)

M Makefile
M rover.c

@@ 1,14 1,20 @@
-LDLIBS := -lncursesw
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
 DATAROOTDIR ?= $(PREFIX)/share
 DATADIR ?= $(DATAROOTDIR)
 MANDIR ?= $(DATADIR)/man
 
+CFLAGS ?= -O2
+
+PKG_CONFIG ?= pkg-config
+
+CFLAGS_NCURSESW := `$(PKG_CONFIG) --cflags ncursesw`
+LIBS_NCURSESW := `$(PKG_CONFIG) --libs ncursesw`
+
 all: rover
 
 rover: rover.c config.h
-	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LDLIBS)
+	$(CC) $(CFLAGS) $(CFLAGS_NCURSESW) -o $@ $< $(LDFLAGS) $(LIBS_NCURSESW)
 
 install: rover
 	rm -f $(DESTDIR)$(BINDIR)/rover

@@ 1,4 1,6 @@
+#ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE       700
+#endif
 #define _XOPEN_SOURCE_EXTENDED
 #define _FILE_OFFSET_BITS   64