Mercurial > lcfOS

diff cos/Makefile @ 20:b1fed2171e1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Now working with 2 MB pages
author windel
date Mon, 28 Nov 2011 20:54:40 +0100
parents 6129643f5c34
children 69bc6d477b38
line wrap: on
line diff
--- a/cos/Makefile	Sun Nov 27 21:38:38 2011 +0100
+++ b/cos/Makefile	Mon Nov 28 20:54:40 2011 +0100
@@ -2,12 +2,10 @@
 
 all: bootdisk.img Makefile
 
-bootdisk.img: lcfosc.elf grub/menu.lst Makefile
-	objcopy -O binary lcfosc.elf lcfosc.bin
+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
-	mdir -i bootdisk.img
 
 CRT0 = kernel/goto64.o
 
@@ -28,8 +26,8 @@
 	kernel/handlers.o
 
 
-lcfosc.elf: $(CRT0) $(OBJECTS) linker.ld
-	ld -T linker.ld -o lcfosc.elf $(CRT0) $(OBJECTS)
+lcfosc.bin: $(CRT0) $(OBJECTS) linker.ld
+	ld -T linker.ld -o lcfosc.bin $(CRT0) $(OBJECTS)
 
 %.o : %.asm Makefile
 	nasm -f elf64 -o $@ $<
@@ -38,5 +36,5 @@
 	gcc $(CFLAGS) -o $@ -c $< -Wall -Wextra -Werror
 
 clean:
-	rm $(OBJECTS) $(CRT0) lcfosc.bin lcfosc.elf
+	rm $(OBJECTS) $(CRT0) lcfosc.bin