diff cos/kernel/Makefile @ 29:7e3bdcb391dc

Added get_page function to mm
author windel
date Thu, 29 Dec 2011 19:34:01 +0100
parents 47b7df514243
children 0148f55bfe24
line wrap: on
line diff
--- a/cos/kernel/Makefile	Wed Dec 28 13:38:43 2011 +0100
+++ b/cos/kernel/Makefile	Thu Dec 29 19:34:01 2011 +0100
@@ -1,11 +1,6 @@
 # vim: set noexpandtab:
 
-all: bootdisk.img Makefile
-
-bootdisk.img: lcfosc.bin grub/menu.lst Makefile
-	cp grub/emptybootdisk.img bootdisk.img
-	mcopy -D o -i bootdisk.img lcfosc.bin ::
-	mcopy -D o -i bootdisk.img grub/menu.lst ::/grub
+all: lcfos.bin Makefile
 
 CRT0 = goto64.o
 
@@ -15,13 +10,13 @@
 OBJECTS = video.o snprintf.o kernel.o asmcode.o handlers.o keyboard.o \
 			klib.o malloc.o task.o mm.o timer.o
 
-lcfosc.bin: $(CRT0) $(OBJECTS) link.ld
-	ld -T link.ld -s -o lcfosc.bin $(CRT0) $(OBJECTS)
+lcfos.bin: $(CRT0) $(OBJECTS) link.ld
+	ld -T link.ld -s -o lcfos.bin $(CRT0) $(OBJECTS)
 
-%.o : %.asm Makefile
+%.o : %.asm
 	nasm -f elf64 -o $@ $<
 
-%.o : %.c Makefile
+%.o : %.c
 	gcc $(CFLAGS) -o $@ -c $<
 
 clean: