diff options
author | Gordon GECOS <u@adam> | 2020-10-25 18:13:54 -0400 |
---|---|---|
committer | Gordon GECOS <u@adam> | 2020-10-25 18:13:54 -0400 |
commit | 4840616b1fdf95e86ce21109063370f046289d9f (patch) | |
tree | 81a200e203fe9b6a0012f2fed69e7dfb953f53e1 /Makefile | |
parent | a8b5f0c06f5f8aaff8afa7ff188a3f4e95d7e725 (diff) |
commit everything for steve
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -125,7 +125,7 @@ include user.mk | |||
125 | 125 | ||
126 | .PHONY: submodules build-submodules $(SUBMODULES) | 126 | .PHONY: submodules build-submodules $(SUBMODULES) |
127 | $(SUBMODULES): stack | 127 | $(SUBMODULES): stack |
128 | @a=$$(cd $@ && git status -uno -s) && (if test -z "$$a"; then set -x; git submodule update --init $@/; fi) | 128 | @a=$$(cd $@ && git status -uno -s) && (if test -z "$$a"; then set -x; git submodule update --init --recursive $@/; fi) |
129 | $(MAKE) -C $@ $(cmd) | 129 | $(MAKE) -C $@ $(cmd) |
130 | 130 | ||
131 | submodules: build-submodules | 131 | submodules: build-submodules |
@@ -135,7 +135,7 @@ build-submodules: $(SUBMODULES) | |||
135 | 135 | ||
136 | .PHONY: update-submodules | 136 | .PHONY: update-submodules |
137 | update-submodules: | 137 | update-submodules: |
138 | git submodule update --init | 138 | git submodule update --init --recursive |
139 | 139 | ||
140 | install-submodules: cmd=install | 140 | install-submodules: cmd=install |
141 | install-submodules: update-submodules $(INSTALL_SUBMODULES) | 141 | install-submodules: update-submodules $(INSTALL_SUBMODULES) |
@@ -351,3 +351,6 @@ install-stamp: install-bin-programs samizdat-paths.sh ${compiled_programs} | |||
351 | $(CP) ${initramfs_conf_files} ${instdir}${samizdat_initramfs_conf_dir} | 351 | $(CP) ${initramfs_conf_files} ${instdir}${samizdat_initramfs_conf_dir} |
352 | $(CP) ${isolinux_files} ${instdir}${samizdat_isolinux_dir} | 352 | $(CP) ${isolinux_files} ${instdir}${samizdat_isolinux_dir} |
353 | touch $@ | 353 | touch $@ |
354 | |||
355 | bootclean: | ||
356 | rm -f samizdat.disk.img boot-disk.template.img boot-disk.img | ||