diff options
author | Andrew Cady <d@jerkface.net> | 2020-05-03 16:19:31 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2020-05-03 16:19:31 -0400 |
commit | e49999fa850147d2c0576af663cd38293483b529 (patch) | |
tree | e2405277d265c1d240aab3577d76bce18dda1232 /Makefile | |
parent | dc95bfb047aeed0f3e5899c33934fc1736c3c26b (diff) |
build fixes: installing dependencies
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -12,9 +12,18 @@ SUBMODULES = fsmgr kiki openssh | |||
12 | 12 | ||
13 | all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES} | 13 | all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES} |
14 | 14 | ||
15 | dynmenu: src/dynmenu.cpp | 15 | .PHONY: stack |
16 | stack: | ||
17 | which stack >/dev/null || curl -sSL https://get.haskellstack.org/ | sh | ||
18 | |||
19 | build-deps: build-dep-stamp | ||
20 | build-dep-stamp: build-deps.txt | ||
21 | sudo apt-get install --no-upgrade $$(cat build-deps.txt) | ||
22 | touch $@ | ||
23 | |||
24 | dynmenu: src/dynmenu.cpp build-deps | ||
16 | $(CXX) $(CFLAGS) $< -o $@ -lcurses | 25 | $(CXX) $(CFLAGS) $< -o $@ -lcurses |
17 | samizdat-pinentry: src/samizdat-pinentry.c | 26 | samizdat-pinentry: src/samizdat-pinentry.c build-deps |
18 | $(CC) $(CFLAGS) $< -o $@ -lcurses | 27 | $(CC) $(CFLAGS) $< -o $@ -lcurses |
19 | wait_for_files: src/wait_for_files.c | 28 | wait_for_files: src/wait_for_files.c |
20 | $(CC) $(CFLAGS) $< -o $@ | 29 | $(CC) $(CFLAGS) $< -o $@ |
@@ -98,7 +107,7 @@ endif | |||
98 | include user.mk | 107 | include user.mk |
99 | 108 | ||
100 | .PHONY: submodule $(SUBMODULES) | 109 | .PHONY: submodule $(SUBMODULES) |
101 | $(SUBMODULES): | 110 | $(SUBMODULES): stack |
102 | [ -e $@/Makefile ] || git submodule update --init | 111 | [ -e $@/Makefile ] || git submodule update --init |
103 | $(MAKE) -C $@ $(cmd) | 112 | $(MAKE) -C $@ $(cmd) |
104 | 113 | ||