diff options
-rw-r--r-- | Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -8,7 +8,9 @@ compiled_programs=${cc_files} ${cpp_files} | |||
8 | CC=gcc -std=gnu99 | 8 | CC=gcc -std=gnu99 |
9 | CFLAGS=-Os | 9 | CFLAGS=-Os |
10 | 10 | ||
11 | SUBMODULES = fsmgr kiki openssh cryptonomic-dyndns-server | 11 | INSTALL_SUBMODULES = fsmgr kiki openssh |
12 | NO_INSTALL_SUBMODULES = cryptonomic-dyndns-server | ||
13 | SUBMODULES = $(INSTALL_SUBMODULES) $(NO_INSTALL_SUBMODULES) | ||
12 | 14 | ||
13 | all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES} | 15 | all: samizdat-paths.sh ${compiled_programs} ${SUBMODULES} |
14 | 16 | ||
@@ -46,12 +48,14 @@ src_bin_programs = xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh | |||
46 | btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh \ | 48 | btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh qemu.sh \ |
47 | dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh \ | 49 | dnsmasq-dhcp-script.sh samizdat-password-agent samizdat-gpg-agent publish-ip.sh \ |
48 | selfstrap samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout \ | 50 | selfstrap samizdat-daily-snapshot-root samizdat-diff-root kiki-export-stdout \ |
49 | kiki-import-stdin store-child-permanently $(dyndns_progs) git-ll-remote | 51 | kiki-import-stdin store-child-permanently git-ll-remote |
50 | 52 | ||
51 | bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils} | 53 | bin_programs=$(addprefix src/, $(src_bin_programs)) samizdat-paths.sh ${cc_files} ${btrfs_utils} |
52 | 54 | ||
53 | dyndns_programs = cryptonomic-dyndns-command samizdat-ssh-command samizdat-ssh-uid | 55 | dyndns_programs = cryptonomic-dyndns-command samizdat-ssh-command samizdat-ssh-uid |
54 | bin_programs += $(addprefix cryptonomic-dyndns-server/bin/, $(dyndns_programs)) | 56 | dyndns_program_paths=$(addprefix cryptonomic-dyndns-server/bin/, $(dyndns_programs)) |
57 | |||
58 | bin_programs += $(dyndns_program_paths) | ||
55 | 59 | ||
56 | btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed) | 60 | btrfs_utils=$(addprefix src/btrfs-utils/, btarfs btrfs-shrink with-btrfs-seed) |
57 | 61 | ||
@@ -124,8 +128,11 @@ $(SUBMODULES): stack | |||
124 | $(if $(UPGRADE_SUBMODULES),, [ -e $@/Makefile ] ||) git submodule update --init | 128 | $(if $(UPGRADE_SUBMODULES),, [ -e $@/Makefile ] ||) git submodule update --init |
125 | $(MAKE) -C $@ $(cmd) | 129 | $(MAKE) -C $@ $(cmd) |
126 | 130 | ||
131 | build-submodules: cmd= | ||
132 | build-submodules: $(SUBMODULES) | ||
133 | |||
127 | install-submodules: cmd=install | 134 | install-submodules: cmd=install |
128 | install-submodules: $(SUBMODULES) | 135 | install-submodules: $(INSTALL_SUBMODULES) |
129 | 136 | ||
130 | rootfs = samizdat | 137 | rootfs = samizdat |
131 | export rootfs | 138 | export rootfs |
@@ -322,6 +329,9 @@ install: | |||
322 | [ -e install-submodules-stamp ] || make install-submodules-stamp | 329 | [ -e install-submodules-stamp ] || make install-submodules-stamp |
323 | $(SUDO_MAKE) install-stamp | 330 | $(SUDO_MAKE) install-stamp |
324 | 331 | ||
332 | build-submodules-stamp: build-submodules | ||
333 | touch $@ | ||
334 | |||
325 | install-submodules-stamp: install-submodules | 335 | install-submodules-stamp: install-submodules |
326 | touch $@ | 336 | touch $@ |
327 | 337 | ||