X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/d0ea4930df84f53ade5059292b32f53e9d9adaba..41506fc5c8cf80c1f1891e1d77f372b9bf5a9ba3:/netwatch/Makefile

diff --git a/netwatch/Makefile b/netwatch/Makefile
index eb3da87..f36ac5f 100644
--- a/netwatch/Makefile
+++ b/netwatch/Makefile
@@ -1,11 +1,12 @@
 -include ../config.mk
+-include ../hardware/ich2/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__ \
-       -Wall -Werror -std=gnu99 -Wstrict-aliasing=2 \
-       -O1 -fno-merge-constants -fno-strict-aliasing
+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
 
@@ -36,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 \