Merge nyus.joshuawise.com:/storage/git/netwatch

[netwatch.git] / aseg-paging / Makefile

diff --git a/aseg-paging/Makefile b/aseg-paging/Makefile
index 0bbe0489e106960d998566a78ab9cf6bc016ec83..a75f078b7891c63e826d824631203ec3a7115486 100644 (file)
--- a/aseg-paging/Makefile
+++ b/aseg-paging/Makefile
@@ -1,8 +1,9 @@
-CC=gcc
+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__ \
 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
+       -Wall -Werror -std=gnu99 -Wstrict-aliasing=2 \
+       -O1 -fno-merge-constants -fno-strict-aliasing

 
 STUBOBJS=entry.o pagingstub-asm.o pagingstub.o
 
 
 STUBOBJS=entry.o pagingstub-asm.o pagingstub.o
 


@@ -40,19 +41,28 @@ OBJS =      ../ich2/smi.o \
        ../pci/pci-raw.o \
        ../pci/pci-bother.o \
        ../net/net.o \
        ../pci/pci-raw.o \
        ../pci/pci-bother.o \
        ../net/net.o \

+       ../net/http/fs.o \
+       ../net/http/httpd.o \

        ../net/3c90x.o \
        ../net/3c90x.o \

+       ../net/rfb.o \
+       ../video/tnt2.o \
+       ../video/fb.o \
+       ../video/generic.o \
+       ../video/text.o \
+       drivers.o \

        ../lib/minilib.o \
        ../lib/doprnt.o \
        ../lib/sprintf.o \
        ../lib/console.o \
        ../lib/serial.o \
        ../lib/minilib.o \
        ../lib/doprnt.o \
        ../lib/sprintf.o \
        ../lib/console.o \
        ../lib/serial.o \

-       ../lib/paging.o \
-       ../aseg/keyboard.o \
+       ../lib/crc32.o \
+       keyboard.o \

        ../aseg/packet.o \
        $(LWIP_OBJS) \
        smi.o \
        vga-overlay.o \
        main.o \
        ../aseg/packet.o \
        $(LWIP_OBJS) \
        smi.o \
        vga-overlay.o \
        main.o \

+       traps.o \

        firstrun.o
 
 
        firstrun.o