From 6fde5cdf2222796d923cf1e88bb29d244d19361c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Tue, 27 Oct 2015 10:11:40 +0100
Subject: build: merge parts of the build system changes from lua branch

Should hopefully fix build on Mac OS X.
---
 Makefile  |  8 ++++----
 config.mk | 21 +++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index b34cb72..142ec01 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,14 @@ config.h:
 	cp config.def.h config.h
 
 vis: config.h config.mk *.c *.h
-	@echo ${CC} ${CFLAGS} *.c ${LDFLAGS} -o $@
-	@${CC} ${CFLAGS} *.c ${LDFLAGS} -o $@
+	@echo ${CC} ${CFLAGS} ${CFLAGS_VIS} *.c ${LDFLAGS} ${LDFLAGS_VIS} -o $@
+	@${CC} ${CFLAGS} ${CFLAGS_VIS} *.c ${LDFLAGS} ${LDFLAGS_VIS} -o $@
 
 debug: clean
-	@$(MAKE) CFLAGS='${DEBUG_CFLAGS}'
+	@$(MAKE) CFLAGS_VIS='${DEBUG_CFLAGS_VIS}'
 
 profile: clean
-	@$(MAKE) CFLAGS='${DEBUG_CFLAGS} -pg'
+	@$(MAKE) CFLAGS_VIS='${DEBUG_CFLAGS_VIS} -pg'
 
 clean:
 	@echo cleaning
diff --git a/config.mk b/config.mk
index eb2f172..73027bf 100644
--- a/config.mk
+++ b/config.mk
@@ -25,9 +25,13 @@ endif
 PREFIX ?= /usr/local
 MANPREFIX = ${PREFIX}/share/man
 
-INCS = -I.
-LIBS = -lc -lncursesw -ltermkey
+CFLAGS_TERMKEY = $(shell pkg-config --cflags termkey 2> /dev/null || echo "")
+CFLAGS_CURSES = $(shell pkg-config --cflags ncursesw 2> /dev/null || echo "-I/usr/include/ncursesw")
 
+LDFLAGS_TERMKEY = $(shell pkg-config --libs termkey 2> /dev/null || echo "-ltermkey")
+LDFLAGS_CURSES = $(shell pkg-config --libs ncursesw 2> /dev/null || echo "-lncursesw")
+
+LIBS = -lc
 OS = $(shell uname)
 
 ifeq (${OS},Linux)
@@ -40,27 +44,24 @@ ifeq (${OS},Linux)
 		LIBS += -lacl
 	endif
 else ifeq (${OS},Darwin)
-	LIBS = -lc -lncurses
 	CFLAGS += -D_DARWIN_C_SOURCE
 else ifeq (${OS},OpenBSD)
-	LIBS = -lc -lncurses
 	CFLAGS += -D_BSD_SOURCE
 else ifeq (${OS},FreeBSD)
 	CFLAGS += -D_BSD_SOURCE
 else ifeq (${OS},NetBSD)
-	LIBS = -lc -lcurses
 	CFLAGS += -D_BSD_SOURCE
-else ifeq (${OS},SunOS)
-	INCS += -I/usr/include/ncurses
 else ifeq (${OS},AIX)
 	CFLAGS += -D_ALL_SOURCE
 endif
 
-CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
+CFLAGS_LIBS = $(CFLAGS_TERMKEY) $(CFLAGS_CURSES)
+LDFLAGS_LIBS = $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LIBS)
 
-LDFLAGS += ${LIBS}
+CFLAGS_VIS = $(CFLAGS_LIBS) -std=c99 -Os -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
+LDFLAGS_VIS = $(LDFLAGS_LIBS)
 
-DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter
+DEBUG_CFLAGS_VIS = ${CFLAGS_VIS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter
 
 CC ?= cc
 STRIP ?= strip
-- 
cgit v1.2.3