Merge ELF loader.

[netwatch.git] / grubload / Makefile

diff --git a/grubload/Makefile b/grubload/Makefile
index 971fb5ce2eb312e7b3f6d065c3119841751f32f8..f0f9742d55564c4f8f0842cbfc60b4e62be82b38 100644 (file)
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,4 +1,4 @@
-OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o
+OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o realmode.o loader.o

 CC=gcc
 CFLAGS=-nostdlib -I../include -I. -fno-builtin -nostdinc
 
 CC=gcc
 CFLAGS=-nostdlib -I../include -I. -fno-builtin -nostdinc
 


@@ -6,3 +6,9 @@ all: multiboot
 
 multiboot: $(OBJS)
        ld -o multiboot $(OBJS) -Ttext=0x100000
 
 multiboot: $(OBJS)
        ld -o multiboot $(OBJS) -Ttext=0x100000

+
+realmode.bin: realmode.asm
+       nasm -o realmode.bin realmode.asm
+
+realmode.o: realmode.bin
+       objcopy -I binary -B i386 -O elf32-i386 realmode.bin realmode.o