From c778e72af83229eca8a8da7788230544ddb36c83 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sun, 4 Oct 2020 00:01:05 +0200 Subject: [PATCH] Fix up make clean --- Makefile | 9 ++++++--- decompressor/Makefile | 2 +- stage2/Makefile | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7dfa4a98..82c7b262 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ all: stage2 decompressor clean: stage2-clean decompressor-clean test-clean rm -f stage2/stage2.bin.gz +distclean: clean + rm limine-install + stage2: $(MAKE) -C stage2 all @@ -38,7 +41,7 @@ test.img: parted -s test.img mklabel msdos parted -s test.img mkpart primary 2048s 100% -echfs-test: test.img +echfs-test: limine-install test.img $(MAKE) -C test echfs-utils -m -p0 test.img quick-format 512 echfs-utils -m -p0 test.img import test/test.elf boot/test.elf @@ -47,7 +50,7 @@ echfs-test: test.img ./limine-install limine.bin test.img qemu-system-x86_64 -net none -smp 4 -enable-kvm -cpu host -hda test.img -debugcon stdio -ext2-test: test.img +ext2-test: limine-install test.img $(MAKE) -C test rm -rf test_image/ mkdir test_image @@ -65,7 +68,7 @@ ext2-test: test.img ./limine-install limine.bin test.img qemu-system-x86_64 -net none -smp 4 -enable-kvm -cpu host -hda test.img -debugcon stdio -fat32-test: test.img +fat32-test: limine-install test.img $(MAKE) -C test rm -rf test_image/ mkdir test_image diff --git a/decompressor/Makefile b/decompressor/Makefile index 108b5b20..eae06264 100644 --- a/decompressor/Makefile +++ b/decompressor/Makefile @@ -53,4 +53,4 @@ decompressor.bin: $(OBJ) nasm $< -f elf32 -o $@ clean: - rm -f decompressor.bin decompressor.elf $(OBJ) + rm -f decompressor.bin decompressor.elf $(OBJ) $(HEADER_DEPS) diff --git a/stage2/Makefile b/stage2/Makefile index 90f4cff9..48b4d9a8 100644 --- a/stage2/Makefile +++ b/stage2/Makefile @@ -55,4 +55,4 @@ stage2.bin: $(OBJ) nasm $< -f elf32 -o $@ clean: - rm -f stage2.bin stage2.elf $(OBJ) + rm -f stage2.bin stage2.elf $(OBJ) $(HEADER_DEPS)