blob: 1a969d67f7fc62755008a19cbaca6b58d6759462 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
diff -Naurp v86d-0.1.8-orig/Makefile v86d-0.1.8/Makefile
--- v86d-0.1.8-orig/Makefile 2008-09-27 21:52:56.000000000 +0200
+++ v86d-0.1.8/Makefile 2008-09-27 21:53:50.000000000 +0200
@@ -17,13 +17,13 @@ ifeq ($(call config_opt,CONFIG_X86EMU),t
CFLAGS += -Ilibs/x86emu
LDFLAGS += -Llibs/x86emu
LDLIBS += -lx86emu
- V86OBJS = v86_x86emu.o v86_mem.o
+ V86OBJS = v86_x86emu.o v86_mem.o v86_common.o
V86LIB = x86emu
else
CFLAGS += -Ilibs/lrmi-0.10
LDFLAGS += -Llibs/lrmi-0.10 -static
LDLIBS += -llrmi
- V86OBJS = v86_lrmi.o
+ V86OBJS = v86_lrmi.o v86_common.o
V86LIB = lrmi
endif
@@ -40,17 +40,17 @@ all: $(V86LIB) v86d $(DEBUG_BUILD)
%.o: %.c v86.h
$(CC) $(CFLAGS) -c -o $@ $<
-v86d: v86.o v86_common.o $(V86OBJS)
- $(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@
+v86d: $(V86OBJS) $(V86LIB) v86.o
+ $(CC) $(LDFLAGS) $(V86OBJS) v86.o $(LDLIBS) -o $@
-testvbe: testvbe.o v86_common.o $(V86OBJS)
- $(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@
+testvbe: $(V86OBJS) $(V86LIB) testvbe.o
+ $(CC) $(LDFLAGS) $(V86OBJS) testvbe.o $(LDLIBS) -o $@
x86emu:
- make -w -C libs/x86emu
+ $(MAKE) -w -C libs/x86emu
lrmi:
- make -e -w -C libs/lrmi-0.10 liblrmi.a
+ $(MAKE) -e -w -C libs/lrmi-0.10 liblrmi.a
clean:
rm -rf *.o v86d testvbe
|
GitWeb
