Makefile

@@ -3,10 +3,7 @@
 #Some definitions
 SRC_DIR = src
 BUILD_DIR = build
-
 LOADER_DIR = module_bootloader
-LOADER_NAME = uOS.iso
-LOADER_IMG = $(BUILD_DIR)/$(LOADER_NAME)
 
 KERNEL_MAIN = $(SRC_DIR)/main.c
 KERNEL_MAIN_OBJ = $(BUILD_DIR)/main.o
@@ -40,17 +37,12 @@ $(KERNEL_IMG): $(KERNEL_MAIN_OBJ) $(ENTRY_ASM_OBJ)
 run: all
 	$(QEMU) -kernel $(KERNEL_IMG)
 
-$(LOADER_IMG): $(KERNEL_IMG)
-	cp $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
+iso: all
+	mv $(KERNEL_IMG) $(LOADER_DIR)/src/boot/; \
 	cd $(LOADER_DIR);	\
 	make all;			\
 	cd ..;				\
-	cp $(LOADER_DIR)/$(LOADER_IMG) $(BUILD_DIR)/
-
-iso: $(LOADER_IMG)
-
-run_iso: iso
-	$(QEMU) -cdrom $(LOADER_IMG)
+	mv $(LOADER_DIR)/build/uOS.iso $(BUILD_DIR)/
 
 clean:
 	rm -rf $(BUILD_DIR)/*