From 5f5699fb3a93f2a478f3888236f7c25bc7975fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 14 Oct 2015 10:21:30 +0200 Subject: Overhaul build system Add separate per library {C,LD}FLAGS and use default values from pkg-config to allow for finer control. Disable pkg-config by setting PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR= Override flags completely by specifying them as arguments to make: $ make CFLAGS_CURSES="your custom flags for curses" Also introduce a new, experimental Makefile target standalone. It tries to build a self contained statically linked vis binary. All dependencies (musl, ncurses, termkey, lua, lpeg) are build from source. Lua is patched to include lpeg as a statically built module. --- config.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'config.mk') diff --git a/config.mk b/config.mk index 73027bf..e69c821 100644 --- a/config.mk +++ b/config.mk @@ -24,14 +24,17 @@ endif PREFIX ?= /usr/local MANPREFIX = ${PREFIX}/share/man +SHAREPREFIX = ${PREFIX}/share/vis +CFLAGS_LUA = $(shell pkg-config --cflags lua5.1 2> /dev/null || echo "-I/usr/include/lua5.1") 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_LUA = $(shell pkg-config --libs lua5.1 2> /dev/null || echo "-llua") 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 +LIBS = -lm -lc OS = $(shell uname) ifeq (${OS},Linux) @@ -55,8 +58,8 @@ else ifeq (${OS},AIX) CFLAGS += -D_ALL_SOURCE endif -CFLAGS_LIBS = $(CFLAGS_TERMKEY) $(CFLAGS_CURSES) -LDFLAGS_LIBS = $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LIBS) +CFLAGS_LIBS = $(CFLAGS_LUA) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES) +LDFLAGS_LIBS = $(LDFLAGS_LUA) $(LDFLAGS_TERMKEY) $(LDFLAGS_CURSES) $(LIBS) CFLAGS_VIS = $(CFLAGS_LIBS) -std=c99 -Os -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 LDFLAGS_VIS = $(LDFLAGS_LIBS) -- cgit v1.2.3