diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2016-01-14 19:00:19 +0100 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2016-01-14 19:00:19 +0100 |
| commit | c71b317966e42809a580664ce372743fcedd8a06 (patch) | |
| tree | fd8fbc8b965247a8caa4059a0f3e513354a618f9 | |
| parent | 6d86dc94cffee3fcda48f634fb05556cb861b0b5 (diff) | |
| download | vis-c71b317966e42809a580664ce372743fcedd8a06.tar.gz vis-c71b317966e42809a580664ce372743fcedd8a06.tar.xz | |
build: cleanup $LIBS variable
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config.mk | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -206,7 +206,7 @@ dependencies: dependency/sources/install-libtermkey dependency/sources/install-l dependencies-full: dependency/sources/install-libncurses dependencies local: dependencies - CFLAGS="$(CFLAGS) -I$(DEPS_INC)" LDFLAGS="$(LDFLAGS) -L$(DEPS_LIB)" $(MAKE) CFLAGS_LUA= CFLAGS_TERMKEY= LDFLAGS_LUA=-llua LDFLAGS_TERMKEY=-ltermkey + CFLAGS="$(CFLAGS) -I$(DEPS_INC)" LDFLAGS="$(LDFLAGS) -L$(DEPS_LIB)" $(MAKE) CFLAGS_LUA= CFLAGS_TERMKEY= LDFLAGS_LUA="-llua -lm" LDFLAGS_TERMKEY=-ltermkey @echo Run with: LD_LIBRARY_PATH=$(DEPS_LIB) VIS_PATH=. ./vis standalone: dependency/sources/install-libmusl @@ -12,7 +12,7 @@ PREFIX ?= /usr/local MANPREFIX = ${PREFIX}/share/man SHAREPREFIX = ${PREFIX}/share/vis -LIBS = -lm -ldl -lc +LIBS = -lc CFLAGS_TERMKEY = $(shell pkg-config --cflags termkey 2> /dev/null || echo "") LDFLAGS_TERMKEY = $(shell pkg-config --libs termkey 2> /dev/null || echo "-ltermkey") @@ -22,7 +22,7 @@ LDFLAGS_CURSES = $(shell pkg-config --libs ncursesw 2> /dev/null || echo "-lncur ifeq (${CONFIG_LUA},1) CFLAGS_LUA = $(shell pkg-config --cflags lua5.2 2> /dev/null || echo "-I/usr/include/lua5.2") - LDFLAGS_LUA = $(shell pkg-config --libs lua5.2 2> /dev/null || echo "-llua") + LDFLAGS_LUA = $(shell pkg-config --libs lua5.2 2> /dev/null || echo "-llua -lm") endif CFLAGS += -DCONFIG_LUA=${CONFIG_LUA} |