fixed merge

[netwatch.git] / aseg-paging / Makefile

diff --git a/aseg-paging/Makefile b/aseg-paging/Makefile
index 0bbe0489e106960d998566a78ab9cf6bc016ec83..ec70ea4b9aed4bac2323809f93d03ec31152904a 100644 (file)
--- a/aseg-paging/Makefile
+++ b/aseg-paging/Makefile
@@ -40,19 +40,25 @@ 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 \
+       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 \
        ../aseg/packet.o \
        $(LWIP_OBJS) \
        smi.o \
        vga-overlay.o \
        main.o \
        ../aseg/keyboard.o \
        ../aseg/packet.o \
        $(LWIP_OBJS) \
        smi.o \
        vga-overlay.o \
        main.o \

+       traps.o \

        firstrun.o
 
 
        firstrun.o