1
0
mirror of https://github.com/falk-werner/webfuse synced 2024-10-27 20:34:10 +00:00

formating

This commit is contained in:
nosamad 2019-03-23 02:31:32 +01:00
parent 6d7f38baa0
commit 5031ed6726

View File

@ -11,6 +11,7 @@ VERSION ?= $(shell cat $(PROJECT_ROOT)/VERSION)
PARALLELMFLAGS ?= -j$(shell nproc) PARALLELMFLAGS ?= -j$(shell nproc)
UID ?= $(shell id -u) UID ?= $(shell id -u)
DOCKER ?= docker DOCKER ?= docker
DOCKER_BUILDKIT ?=
CONTAINER_USER ?= $(UID) CONTAINER_USER ?= $(UID)
CONTAINER_GROUP ?= $(shell id -g) CONTAINER_GROUP ?= $(shell id -g)
CONTAINER_WORKSPACE ?= /workspace CONTAINER_WORKSPACE ?= /workspace
@ -168,7 +169,8 @@ $(OUT)/%/CMakeCache.txt: $(PROJECT_ROOT)/CMakeLists.txt $(OUT)/docker/% | $(OUT_
--volume '$(realpath $(dir $@)):$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \ --volume '$(realpath $(dir $@)):$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
--workdir '$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \ --workdir '$(CONTAINER_WORKSPACE)/$(notdir $(OUT))' \
$(PROJECT_NAME)-$*:$(VERSION) \ $(PROJECT_NAME)-$*:$(VERSION) \
cmake $(CMAKEFLAGS) .. && touch $@ cmake $(CMAKEFLAGS) .. \
&& touch $@
$(OUT_DIRS): $(OUT_DIRS):
$(SILENT)mkdir -p $@ $(SILENT)mkdir -p $@