X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/33e49b2e6d599bc56326841b5b373b9f76adc5f7..8ed5907015b127d1312c13216a8e4875c962da8e:/netwatch/Makefile?ds=sidebyside

diff --git a/netwatch/Makefile b/netwatch/Makefile
index 1d7621a..eb3da87 100644
--- 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