diff --git a/Makefile b/Makefile index 6b1ff4ee..d2af2bac 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,10 @@ -build: $(LUNA_ROOT)/kernel/bin/moon.elf $(LUNA_ROOT)/userspace/bin/Hello.bin +build: $(LUNA_ROOT)/kernel/bin/moon.elf -clean: moon-clean initrd-clean userspace-clean +clean: moon-clean initrd-clean initrd-clean: - rm -f $(LUNA_ROOT)/initrd/boot/moon.elf $(LUNA_ROOT)/Luna.iso $(LUNA_ROOT)/initrd/sys/Hello.bin + rm -f $(LUNA_ROOT)/initrd/boot/moon.elf $(LUNA_ROOT)/Luna.iso -install: $(LUNA_ROOT)/initrd/boot/moon.elf $(LUNA_ROOT)/initrd/sys/Hello.bin +install: $(LUNA_ROOT)/initrd/boot/moon.elf -include kernel/Makefile -include userspace/Makefile \ No newline at end of file +include kernel/Makefile \ No newline at end of file diff --git a/initrd/sys/Hello.bin b/initrd/sys/Hello.bin deleted file mode 100644 index 5f9eebf1..00000000 --- a/initrd/sys/Hello.bin +++ /dev/null @@ -1 +0,0 @@ -Í1 \ No newline at end of file diff --git a/userspace/Makefile b/userspace/Makefile deleted file mode 100644 index 19af5502..00000000 --- a/userspace/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -USERSPACE_DIR=$(LUNA_ROOT)/userspace -USERSPACE_SRC=$(USERSPACE_DIR)/src -USERSPACE_BIN=$(USERSPACE_DIR)/bin - -$(USERSPACE_BIN)/Hello.bin: $(USERSPACE_SRC)/Hello.asm - nasm -fbin $< -o $@ - -$(LUNA_ROOT)/initrd/sys/Hello.bin: $(USERSPACE_BIN)/Hello.bin - cp $< $@ - -userspace-clean: - rm -rf $(USERSPACE_BIN)/* \ No newline at end of file diff --git a/userspace/bin/Hello.bin b/userspace/bin/Hello.bin deleted file mode 100644 index 5f9eebf1..00000000 --- a/userspace/bin/Hello.bin +++ /dev/null @@ -1 +0,0 @@ -Í1 \ No newline at end of file diff --git a/userspace/src/Hello.asm b/userspace/src/Hello.asm deleted file mode 100644 index c6f79325..00000000 --- a/userspace/src/Hello.asm +++ /dev/null @@ -1,5 +0,0 @@ -[BITS 64] -[ORG 7000h] - -init: - int 31h ; exit \ No newline at end of file