More churn moving files around.

[netwatch.git] / netwatch / Makefile

diff --git a/netwatch/Makefile b/netwatch/Makefile
index 1d7621a9540545026475d80285ee5b99dc4b2836..f36ac5f6d44994ab72d0f495d707b4ca6bbd97b1 100644 (file)
--- a/netwatch/Makefile
+++ b/netwatch/Makefile
@@ -1,9 +1,12 @@
-CC=gcc-4.3
-CFLAGS=-I../include -I../include/raw \
-       -I../lwip/src/include -I../lwip/src/include/ipv4 \
-       -nostdlib -nostdinc -fno-builtin -D__RAW__ \
-       -Wall -Werror -std=gnu99 -Wstrict-aliasing=2 \
-       -O1 -fno-merge-constants -fno-strict-aliasing
+-include ../config.mk
+-include ../hardware/ich2/config.mk
+
+CC=$(CROSS)gcc
+CFLAGS+=-I../include -I../net -I../include/raw \
+        -I../lwip/src/include -I../lwip/src/include/ipv4 \
+        -nostdlib -nostdinc -fno-builtin -D__RAW__ \
+        -Wall -Werror -std=gnu99 -Wstrict-aliasing=2 \
+        -O1 -fno-merge-constants -fno-strict-aliasing
 
 STUBOBJS=entry.o pagingstub-asm.o pagingstub.o
 
@@ -34,21 +37,19 @@ LWIP_OBJS = \
        ../lwip/src/netif/ethernetif.o
 
 
-OBJS = ../ich2/smi.o \
-       ../ich2/smram-ich2.o \
-       ../ich2/ich2-timer.o \
+OBJS = $(CHIP_OBJS) \
        ../pci/pci.o \
        ../pci/pci-raw.o \
        ../pci/pci-bother.o \
        ../net/net.o \
        ../net/http/fs.o \
        ../net/http/httpd.o \
-       ../net/3c90x.o \
+       ../hardware/net/3c90x.o \
        ../net/rfb.o \
-       ../video/tnt2.o \
-       ../video/fb.o \
-       ../video/generic.o \
-       ../video/text.o \
+       ../hardware/video/tnt2.o \
+       ../hardware/video/fb.o \
+       ../hardware/video/generic.o \
+       ../hardware/video/text.o \
        drivers.o \
        ../lib/minilib.o \
        ../lib/doprnt.o \
@@ -56,6 +57,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 +72,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