From d3674d1b1566c9a94d7dc770139feea0ac8a7666 Mon Sep 17 00:00:00 2001
From: Braiden Vasco <braiden-vasco@users.noreply.github.com>
Date: Thu, 9 Nov 2017 09:58:39 +0000
Subject: [PATCH] Remove subdir "iso"

---
 .gitignore                                |  1 -
 Makefile                                  | 25 ++++++++---------------
 iso/Makefile                              | 10 ---------
 {iso/rootfs => rootfs}/boot/grub/grub.cfg |  0
 4 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 iso/Makefile
 rename {iso/rootfs => rootfs}/boot/grub/grub.cfg (100%)

diff --git a/.gitignore b/.gitignore
index 824d068..5ce654f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@
 *.iso
 
 /config.mk
-/kernelmq
 /arch/*/kernelmq
diff --git a/Makefile b/Makefile
index b55f0f5..566d15f 100644
--- a/Makefile
+++ b/Makefile
@@ -5,20 +5,26 @@ export AS = $(CCPREFIX)as
 export CC = $(CCPREFIX)gcc
 
 export INCLUDE = $(shell pwd)/include
-export KERNEL  = $(shell pwd)/kernelmq
+export KERNEL  = $(shell pwd)/rootfs/boot/kernelmq.multiboot2
 
 export LIBSRC  = $(shell pwd)/src/libsrc.a
 export LIBK    = $(shell pwd)/libk/libk.a
 
 export CFLAGS = -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra -I $(INCLUDE)
 
-SUBDIRS = arch iso libk src
+SUBDIRS = arch libk src
 
-run: run-iso
+IMAGE = $(shell pwd)/image.iso
+
+run: all-kernel
+	grub-file --is-x86-multiboot2 $(KERNEL)
+	grub-mkrescue rootfs -o $(IMAGE)
+	qemu-system-i386 -cdrom $(IMAGE)
 
 all: all-kernel
 
 clean: clean-kernel $(addprefix clean-, $(SUBDIRS))
+	rm -f $(IMAGE)
 
 ##########
 # Kernel #
@@ -50,19 +56,6 @@ all-arch: all-src all-libk
 clean-arch:
 	make clean -C arch
 
-#######
-# ISO #
-#######
-
-run-iso: all-iso
-	make run -C iso
-
-all-iso: all-kernel
-	make all -C iso
-
-clean-iso:
-	make clean -C iso
-
 ########
 # libk #
 ########
diff --git a/iso/Makefile b/iso/Makefile
deleted file mode 100644
index 8ba1aee..0000000
--- a/iso/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-run: all
-	qemu-system-i386 -cdrom image.iso
-
-all:
-	grub-file --is-x86-multiboot2 "$(KERNEL)"
-	cp "$(KERNEL)" rootfs/boot/kernelmq.multiboot2
-	grub-mkrescue rootfs -o image.iso
-
-clean:
-	rm -f image.iso rootfs/boot/kernelmq.multiboot2
diff --git a/iso/rootfs/boot/grub/grub.cfg b/rootfs/boot/grub/grub.cfg
similarity index 100%
rename from iso/rootfs/boot/grub/grub.cfg
rename to rootfs/boot/grub/grub.cfg