From: Joshua Wise Date: Fri, 19 Sep 2008 20:16:02 +0000 (-0400) Subject: merge X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/5ae81164883c737f0204dc26beb7bb7488693a1d?ds=inline;hp=--cc merge --- 5ae81164883c737f0204dc26beb7bb7488693a1d diff --cc aseg/Makefile index e2edc87,6d22af1..5806bd1 --- a/aseg/Makefile +++ b/aseg/Makefile @@@ -1,6 -1,6 +1,6 @@@ CC=gcc CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__ -Wall -Werror -pedantic -ansi -std=gnu99 - OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o -OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o vga-overlay.o ++OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o ../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o all: aseg.elf