diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2016-04-22 18:32:45 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2016-04-22 18:32:45 +0200 |
| commit | 43f88d0ae0831fa1e9f930b6f0882e3a2109426e (patch) | |
| tree | 81a9efc65195d0d2103aaa7eda4bb49545a544e4 | |
| parent | 398f44415c89f478298861c3ff655bdbda716af1 (diff) | |
| download | vis-43f88d0ae0831fa1e9f930b6f0882e3a2109426e.tar.gz vis-43f88d0ae0831fa1e9f930b6f0882e3a2109426e.tar.xz | |
build: clean up make local/standalone implementation
Run configure script for all targets instead of fiddling with
Makefile variables directly.
| -rw-r--r-- | GNUmakefile | 20 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 9 insertions, 17 deletions
diff --git a/GNUmakefile b/GNUmakefile index 32459de..1091e93 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -161,6 +161,7 @@ dependencies-clean: rm -f dependency/build/local rm -f dependency/build/standalone rm -rf dependency/install + rm -f config.mk dependencies-local: [ ! -e dependency/build/standalone ] || $(MAKE) dependencies-clean @@ -174,11 +175,8 @@ dependencies-local: local: clean $(MAKE) dependencies-local - $(MAKE) CFLAGS="$(CFLAGS) -I$(DEPS_INC)" LDFLAGS="$(LDFLAGS) -L$(DEPS_LIB)" \ - CFLAGS_CURSES="-I/usr/include/ncursesw" LDFLAGS_CURSES="-lncursesw" \ - CFLAGS_TERMKEY= LDFLAGS_TERMKEY=-ltermkey \ - CFLAGS_LUA="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -DLUA_COMPAT_ALL" \ - LDFLAGS_LUA="-llua -lm -ldl" + ./configure CFLAGS="-I$(DEPS_INC)" LDFLAGS="-L$(DEPS_LIB)" LD_LIBRARY_PATH="$(DEPS_LIB)" + $(MAKE) @echo Run with: LD_LIBRARY_PATH=$(DEPS_LIB) ./vis standalone: clean @@ -186,14 +184,8 @@ standalone: clean $(MAKE) dependency/build/libmusl-install PATH=$(DEPS_BIN):$$PATH PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR= $(MAKE) \ CC=musl-gcc dependency/build/standalone - PATH=$(DEPS_BIN):$$PATH PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR= $(MAKE) \ - CC=musl-gcc CFLAGS="--static -Wl,--as-needed" \ - CFLAGS_CURSES= LDFLAGS_CURSES="-lncursesw" \ - CFLAGS_TERMKEY= LDFLAGS_TERMKEY=-ltermkey \ - CFLAGS_LUA="-DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -DLUA_COMPAT_ALL" \ - LDFLAGS_LUA="-llua -lm -ldl" \ - CFLAGS_AUTO=-Os LDFLAGS_AUTO= \ - CONFIG_ACL=0 CFLAGS_ACL= LDFLAGS_ACL= \ - CONFIG_SELINUX=0 CFLAGS_SELINUX= LDFLAGS_SELINUX= + PATH=$(DEPS_BIN):$$PATH PKG_CONFIG_PATH= PKG_CONFIG_LIBDIR= ./configure \ + CFLAGS="-I$(DEPS_INC) --static -Wl,--as-needed" LDFLAGS="-L$(DEPS_LIB)" CC=musl-gcc + PATH=$(DEPS_BIN):$$PATH $(MAKE) .PHONY: standalone local dependencies-common dependencies-local dependencies-clean @@ -259,7 +259,7 @@ for curses in ncursesw ncurses curses; do fi fi - CFLAGS_CURSES="-I/usr/include/$curses" + CFLAGS_CURSES="" LDFLAGS_CURSES="-l$curses" if $CC $CFLAGS $CFLAGS_CURSES "$tmpc" \ @@ -336,8 +336,8 @@ EOF fi fi - CFLAGS_LUA="-I/usr/include/$liblua" - LDFLAGS_LUA="-l$liblua -lm" + CFLAGS_LUA="" + LDFLAGS_LUA="-l$liblua -lm -ldl" if $CC $CFLAGS $CFLAGS_LUA "$tmpc" \ $LDFLAGS $LDFLAGS_LUA -o "$tmpo" >/dev/null 2>&1 ; then |