diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-23 15:53:38 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-23 15:53:38 +0000 |
| commit | 86051f919fc34d731619fc3a1266c5a2c4855b01 (patch) | |
| tree | ef1cc51fa135493eefd0987350ff6f2aebbde01b /util/vgabios/Makefile | |
| parent | b7f53b2329d468a6efa50c7c1163079d296fbdc3 (diff) | |
Use coreboot-internal version of x86emu for the vgabios utility.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Joseph Smith <joe@settoplinux.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5276 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/vgabios/Makefile')
| -rw-r--r-- | util/vgabios/Makefile | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/util/vgabios/Makefile b/util/vgabios/Makefile index c1359bbdc1..e995f007ce 100644 --- a/util/vgabios/Makefile +++ b/util/vgabios/Makefile @@ -7,29 +7,27 @@ # CC = gcc -CFLAGS = -Wall -Ix86emu/include -O2 -g +CFLAGS = -Wall -Iinclude -I../../src/devices/oprom/include/ -O2 -g -INTOBJS = int10.o int15.o int16.o int1a.o inte6.o -OBJECTS = testbios.o helper_exec.o helper_mem.o $(INTOBJS) - -LIBS = x86emu/src/x86emu/libx86emu.a +INTOBJS = int10.o int15.o int16.o int1a.o inte6.o +X86EMUOBJS = sys.o decode.o ops.o ops2.o prim_ops.o fpu.o debug.o +OBJS = testbios.o helper_exec.o helper_mem.o $(INTOBJS) $(X86EMUOBJS) # user space pci is the only option right now. -OBJECTS += pci-userspace.o +OBJS += pci-userspace.o + +LIBS=-lpci all: testbios -testbios: $(OBJECTS) $(LIBS) - $(CC) -o testbios $(OBJECTS) $(LIBS) -lpci +testbios: $(OBJS) + $(CC) $(CFLAGS) -o $@ $^ $(LIBS) helper_exec.o: helper_exec.c test.h -x86emu/src/x86emu/libx86emu.a: - $(MAKE) -C x86emu/src/x86emu/ -f makefile.linux - clean: - $(MAKE) -C x86emu/src/x86emu/ -f makefile.linux clean rm -f *.o *~ testbios -distclean: clean - $(MAKE) -C x86emu/src/x86emu/ -f makefile.linux clean +%.o: ../../src/devices/oprom/x86emu/%.c + $(CC) $(CFLAGS) -include stdio.h -c -o $@ $^ + |