slight grubload cleanups; use __RAW__ defined by build scripts instead of __linux__

[netwatch.git] / grubload / Makefile

diff --git a/grubload/Makefile b/grubload/Makefile
index 971fb5ce2eb312e7b3f6d065c3119841751f32f8..4eef9211a71d8a37cfe2aa24e7c9e971e6de2b3c 100644 (file)
--- a/grubload/Makefile
+++ b/grubload/Makefile
@@ -1,8 +1,17 @@
-OBJS=multiboot_c.o multiboot_asm.o console.o minilib.o
+OBJS=multiboot_c.o multiboot_asm.o realmode.o loader.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o

 CC=gcc
 CC=gcc

-CFLAGS=-nostdlib -I../include -I. -fno-builtin -nostdinc
+CFLAGS=-nostdlib -I../include -I../include/raw -I. -D__RAW__ -fno-builtin -nostdinc

 
 all: multiboot
 
 multiboot: $(OBJS)
        ld -o multiboot $(OBJS) -Ttext=0x100000
 
 all: multiboot
 
 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
+
+clean:
+       rm -f $(OBJS) realmode.bin multiboot