summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-05-03 16:19:31 -0400
committerAndrew Cady <d@jerkface.net>2020-05-03 16:19:31 -0400
commite49999fa850147d2c0576af663cd38293483b529 (patch)
treee2405277d265c1d240aab3577d76bce18dda1232
parentdc95bfb047aeed0f3e5899c33934fc1736c3c26b (diff)
build fixes: installing dependencies
-rw-r--r--.gitignore1
-rw-r--r--Makefile15
-rw-r--r--build-deps.txt2
3 files changed, 15 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index f187d13..8599df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ ssh-askpass-gnome-dbgsym_7.9p1-10_amd64.deb
36ssh-askpass-gnome_7.9p1-10_amd64.deb 36ssh-askpass-gnome_7.9p1-10_amd64.deb
37ssh_7.9p1-10_all.deb 37ssh_7.9p1-10_all.deb
38rootfs/_build/ 38rootfs/_build/
39/build-dep-stamp
diff --git a/Makefile b/Makefile
index a1b41fa..4b8eb5a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,18 @@ SUBMODULES = fsmgr kiki openssh
12 12
13all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES} 13all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES}
14 14
15dynmenu: src/dynmenu.cpp 15.PHONY: stack
16stack:
17 which stack >/dev/null || curl -sSL https://get.haskellstack.org/ | sh
18
19build-deps: build-dep-stamp
20build-dep-stamp: build-deps.txt
21 sudo apt-get install --no-upgrade $$(cat build-deps.txt)
22 touch $@
23
24dynmenu: src/dynmenu.cpp build-deps
16 $(CXX) $(CFLAGS) $< -o $@ -lcurses 25 $(CXX) $(CFLAGS) $< -o $@ -lcurses
17samizdat-pinentry: src/samizdat-pinentry.c 26samizdat-pinentry: src/samizdat-pinentry.c build-deps
18 $(CC) $(CFLAGS) $< -o $@ -lcurses 27 $(CC) $(CFLAGS) $< -o $@ -lcurses
19wait_for_files: src/wait_for_files.c 28wait_for_files: src/wait_for_files.c
20 $(CC) $(CFLAGS) $< -o $@ 29 $(CC) $(CFLAGS) $< -o $@
@@ -98,7 +107,7 @@ endif
98include user.mk 107include 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
diff --git a/build-deps.txt b/build-deps.txt
new file mode 100644
index 0000000..1e77cbd
--- /dev/null
+++ b/build-deps.txt
@@ -0,0 +1,2 @@
1build-essential
2libncurses-dev