1 files changed, 9 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 9f03f93..1fc4194 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@ export TARGET=x86_64-unknown-uefi
 export PROFILE=debug
 export OUT_DIR=target/$(TARGET)/$(PROFILE)
 export ESP_DIR=esp
-export KERNEL=$(OUT_DIR)/raisernics.efi
+export KERNEL=$(OUT_DIR)/rsdos.efi
 export BZIMAGE=$(ESP_DIR)/bzImage
 export INITRD=$(ESP_DIR)/initramfs.cpio.gz
-export BOOTLOADER=../rng/rsbl/../build/bootloader/BOOTX64.EFI
+export BOOTLOADER=rsboot/rsboot.efi
 export OVMF=/usr/share/edk2/x64/OVMF.4m.fd
 export BOOT_EFI=$(ESP_DIR)/EFI/BOOT/BOOTX64.EFI
 
@@ -15,7 +15,7 @@ export BOOT_EFI=$(ESP_DIR)/EFI/BOOT/BOOTX64.EFI
 
 # ---- Build ---------------------------------------------------------------
 
-all: $(BZIMAGE) $(INITRD) $(BOOT_EFI)
+all: $(BZIMAGE) $(INITRD)
 
 release: PROFILE=release
 release: export PROFILE=release
@@ -26,16 +26,12 @@ release: all
 # shellcheck disable=SC2034
 CARGO_FLAGS=
 
-$(OUT_DIR)/raisernics.efi: $(shell find src -name '*.rs') Cargo.toml build.rs
-        cargo build --target $(TARGET) $(CARGO_FLAGS)
+$(OUT_DIR)/rsdos.efi: $(shell find rsnix shell rsdos -name '*.rs') Cargo.toml rsnix/Cargo.toml shell/Cargo.toml rsdos/Cargo.toml
+        cargo build --package rsdos --target $(TARGET) $(CARGO_FLAGS)
 
 $(BZIMAGE): $(KERNEL) | $(ESP_DIR)
         cp "$<" "$@"
 
-$(BOOT_EFI): $(BOOTLOADER) | $(ESP_DIR)
-        mkdir -p $(ESP_DIR)/EFI/BOOT
-        cp "$<" "$@"
-
 $(ESP_DIR):
         mkdir -p $(ESP_DIR)
 
@@ -95,7 +91,7 @@ run-image: all
 # ---- Disk image ----------------------------------------------------------
 
 image: all
-        ./tools/boot-image.sh raisernics.img
+        ./tools/boot-image.sh rs-dos.img
 
 # ---- Utilities -----------------------------------------------------------
 
@@ -104,14 +100,14 @@ fmt:
 
 clean:
         cargo clean
-        rm -rf $(ESP_DIR) raisernics.img
+        rm -rf $(ESP_DIR) rs-dos.img
 
 help:
-        @echo "raisernics — Make targets"
+        @echo "rs-dos — Make targets"
         @echo ""
         @echo "  make              build kernel + ESP (default)"
         @echo "  make release      build with --release (smaller binary)"
-        @echo "  make image        create bootable USB image (raisernics.img)"
+        @echo "  make image        create bootable USB image (rs-dos.img)"
         @echo "  make run          QEMU serial console (no graphics)"
         @echo "  make run-gui      QEMU with graphical window (GOP/PS2)"
         @echo "  make debug        QEMU + GDB stub on :1234"