1 files changed, 24 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 893216b..101e521 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,39 @@
 prefix?=/usr/local
 
-all: samizdat-paths.sh
+cc_files=wait_for_files samizdat-pinentry
+cpp_files=dynmenu
 
-bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh btarfs dnsmasq-dhcp-script.sh) samizdat-paths.sh
+compiled_programs=${cc_files} ${cpp_files}
 
-# TODO: compile these here
-samizdat_execs=$(addprefix /home/d/src/samizdat/, wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent)
+CC=gcc -std=gnu99
+CFLAGS=-Os
 
-initrd_files:=$(wildcard src/initrd/*)
+all: samizdat-paths.sh ${compiled_programs}
+
+dynmenu: src/dynmenu.cpp
+        $(CXX) $(CFLAGS) $< -o $@ -lcurses
+samizdat-pinentry: src/samizdat-pinentry.c
+        $(CC) $(CFLAGS)  $< -o $@ -lcurses
+wait_for_files: src/wait_for_files.c
+        $(CC) $(CFLAGS)  $< -o $@
+
+bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh btarfs dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent) samizdat-paths.sh ${cc_files}
+
+initrd_files:=$(wildcard src/initrd/*) dynmenu samizdat-pinentry wait_for_files
 initramfs_conf_files:=$(wildcard initramfs-tools/*)
 
 isolinux_files:=$(wildcard isolinux/*)
 
-.PHONY: samizdat-paths.sh
+clean:
+        rm -f samizdat-paths.sh ${compiled_programs}
+
+.PHONY: samizdat-paths.sh all clean
 samizdat-paths.sh: src/samizdat-paths.in
-        sed -e "s?PREFIX?$(prefix)?g" $< > $@
+        @sed -e "s?PREFIX?$(prefix)?g" $< > $@
 include samizdat-paths.sh
 
-install:
-        install ${bin_programs} ${samizdat_execs} ${instdir}${samizdat_bindir}
+install: ${bin_programs} samizdat-paths.sh ${compiled_programs}
+        install ${bin_programs} ${instdir}${samizdat_bindir}
         mkdir -p ${instdir}${samizdat_initrd_files_dir}
         mkdir -p ${instdir}${samizdat_child_dir}
         mkdir -p ${instdir}${samizdat_grub_efi_dir}