Finally move the LEGKEY garbage into ich2/.

[netwatch.git] / netwatch / Makefile

diff --git a/netwatch/Makefile b/netwatch/Makefile
index 1d7621a9540545026475d80285ee5b99dc4b2836..eb3da87b296b5897a32026c1832377fa2babe008 100644 (file)
--- a/netwatch/Makefile
+++ b/netwatch/Makefile
@@ -1,4 +1,6 @@
-CC=gcc-4.3
+-include ../config.mk
+
+CC=$(CROSS)gcc
 CFLAGS=-I../include -I../include/raw \
        -I../lwip/src/include -I../lwip/src/include/ipv4 \
        -nostdlib -nostdinc -fno-builtin -D__RAW__ \
@@ -56,6 +58,9 @@ OBJS =        ../ich2/smi.o \
        ../lib/console.o \
        ../lib/serial.o \
        ../lib/crc32.o \
+       ../lib/demap.o \
+       ../lib/state.o \
+       ../lib/cpuid.o \
        keyboard.o \
        packet.o \
        $(LWIP_OBJS) \
@@ -68,13 +73,13 @@ OBJS =      ../ich2/smi.o \
 
 all: aseg.elf
 
-aseg.elf: aseg.lds $(STUBOBJS) $(OBJS)
-       ld -o aseg.elf -T aseg.lds $(STUBOBJS) $(OBJS)
+aseg.elf: netwatch-large.lds $(STUBOBJS) $(OBJS)
+       $(CROSS)ld -o aseg.elf -T netwatch-large.lds $(STUBOBJS) $(OBJS)
 
 clean:
        rm -f $(OBJS) aseg.elf entry.bin entry.o
 
 %.o: %.asm
        nasm -o $@.bin $<
-       objcopy -I binary -B i386 -O elf32-i386 $@.bin $@
+       $(CROSS)objcopy -I binary -B i386 -O elf32-i386 $@.bin $@
        rm -f $@.bin