aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2016-03-24 20:04:23 +0100
committerMarc André Tanner <mat@brain-dump.org>2016-03-24 21:25:01 +0100
commitd57c7f991cfaafc44756c7229a5571efae04d576 (patch)
treecb81775f15966219a6f83a7aa8c3db455b3a64e5
parent3170c94077d6bd22aa2204862cbd926486c8a6ac (diff)
downloadvis-d57c7f991cfaafc44756c7229a5571efae04d576.tar.gz
vis-d57c7f991cfaafc44756c7229a5571efae04d576.tar.xz
build: expose make dependency-local target
Remove more stuff when switching between make local and make standalone.
-rw-r--r--GNUmakefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 612dbe0..1b92b2a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -153,22 +153,26 @@ dependency/build/standalone: dependency/build/libncurses-install dependencies-co
touch $@
dependencies-clean:
+ rm -f dependency/build/libmusl-install
rm -rf dependency/build/*curses*
rm -rf dependency/build/libtermkey*
rm -rf dependency/build/*lua*
rm -rf dependency/build/*lpeg*
rm -f dependency/build/local
rm -f dependency/build/standalone
+ rm -rf dependency/install
-local: clean
+dependencies-local:
[ ! -e dependency/build/standalone ] || $(MAKE) dependencies-clean
mkdir -p dependency/build && \
touch dependency/build/libncurses-extract && \
touch dependency/build/libncurses-configure && \
touch dependency/build/libncurses-build && \
touch dependency/build/libncurses-install
-
$(MAKE) dependency/build/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 \
@@ -176,8 +180,9 @@ local: clean
LDFLAGS_LUA="-llua -lm -ldl"
@echo Run with: LD_LIBRARY_PATH=$(DEPS_LIB) ./vis
-standalone: clean dependency/build/libmusl-install
+standalone: clean
[ ! -e dependency/build/local ] || $(MAKE) dependencies-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) \
@@ -190,4 +195,4 @@ standalone: clean dependency/build/libmusl-install
CONFIG_ACL=0 CFLAGS_ACL= LDFLAGS_ACL= \
CONFIG_SELINUX=0 CFLAGS_SELINUX= LDFLAGS_SELINUX=
-.PHONY: standalone local dependencies-common dependencies-clean
+.PHONY: standalone local dependencies-common dependencies-local dependencies-clean