From 6986e706624d234a213455af791878380cba983d Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Thu, 4 Jun 2020 19:39:22 -0400 Subject: Makefile fixes for cryptonomic-dyndns-server submodule --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 65733be..424c1ff 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,9 @@ compiled_programs=${cc_files} ${cpp_files} CC=gcc -std=gnu99 CFLAGS=-Os -SUBMODULES = fsmgr kiki openssh cryptonomic-dyndns-server +INSTALL_SUBMODULES = fsmgr kiki openssh +NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server +SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES) all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES} @@ -46,12 +48,14 @@ src_bin_programs = 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 \ dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh \ selfstrap samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout \ -kiki-import-stdin store-child-permanently $(dyndns_progs) git-ll-remote +kiki-import-stdin store-child-permanently git-ll-remote bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils} dyndns_programs = cryptonomic-dyndns-command samizdat-ssh-command samizdat-ssh-uid -bin_programs += $(addprefix cryptonomic-dyndns-server/bin/, $(dyndns_programs)) +dyndns_program_paths=$(addprefix cryptonomic-dyndns-server/bin/, $(dyndns_programs)) + +bin_programs += $(dyndns_program_paths) btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed) @@ -124,8 +128,11 @@ $(SUBMODULES): stack $(if $(UPGRADE_SUBMODULES),, [ -e $@/Makefile ] ||) git submodule update --init $(MAKE) -C $@ $(cmd) +build-submodules: cmd= +build-submodules: $(SUBMODULES) + install-submodules: cmd=install -install-submodules: $(SUBMODULES) +install-submodules: $(INSTALL_SUBMODULES) rootfs = samizdat export rootfs @@ -322,6 +329,9 @@ install: [ -e install-submodules-stamp ] || make install-submodules-stamp $(SUDO_MAKE) install-stamp +build-submodules-stamp: build-submodules + touch $@ + install-submodules-stamp: install-submodules touch $@ -- cgit v1.2.3