]>
Commit | Line | Data |
---|---|---|
d13e2951 | 1 | diff -Nur o.exmap-0.10/Makefile n.exmap-0.10/Makefile |
2 | --- o.exmap-0.10/Makefile 2006-09-28 18:52:25.000000000 +0200 | |
3 | +++ n.exmap-0.10/Makefile 2007-02-10 12:11:35.000000000 +0100 | |
4 | @@ -4,7 +4,7 @@ | |
5 | ||
6 | # Note this is the build order, and reflects inter-subdir | |
7 | # dependencies. | |
8 | -SUBDIRS=kernel jutil src tools | |
9 | +SUBDIRS=jutil src tools | |
10 | ||
11 | .PHONY: build clean test $(SUBDIRS) | |
12 | ||
13 | diff -Nur o.exmap-0.10/jutil/Makefile n.exmap-0.10/jutil/Makefile | |
14 | --- o.exmap-0.10/jutil/Makefile 2006-09-28 18:52:25.000000000 +0200 | |
15 | +++ n.exmap-0.10/jutil/Makefile 2007-02-10 15:34:58.000000000 +0100 | |
16 | @@ -11,16 +11,14 @@ | |
17 | ETOBJ = egtest.o | |
18 | OBJ += $(ETOBJ) | |
19 | EXES += egtest | |
20 | - | |
21 | -CXX=g++ | |
22 | -CXXFLAGS=-Wall -Werror -g -I. | |
23 | -LD=g++ | |
24 | -LDFLAGS=-lpcre | |
ca1a5a50 | 25 | +override CXXFLAGS += -Wall -I. |
d13e2951 | 26 | +LD=$(CXX) |
27 | +override LDFLAGS += -lpcre | |
28 | ||
29 | build: $(LIBS) $(EXES) | |
30 | ||
31 | trun: $(TROBJ) $(JLIB) | |
32 | - $(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L. | |
33 | + $(LD) $(TROBJ) -o trun $(LDFLAGS) -L. -ljutil | |
34 | ||
35 | $(JLIB): $(JOBJ) | |
36 | ar rs $(JLIB) $(JOBJ) | |
37 | diff -Nur o.exmap-0.10/src/Makefile n.exmap-0.10/src/Makefile | |
38 | --- o.exmap-0.10/src/Makefile 2006-09-28 18:52:25.000000000 +0200 | |
39 | +++ n.exmap-0.10/src/Makefile 2007-02-10 15:38:04.000000000 +0100 | |
40 | @@ -1,5 +1,5 @@ | |
41 | CXX=g++ | |
42 | -LD=g++ | |
43 | +LD=$(CXX) | |
44 | JUTILDIR=../jutil | |
45 | ||
46 | #CXXFLAGS += -pg | |
47 | @@ -11,8 +11,8 @@ | |
48 | ||
49 | EXMAP_OBJ=Exmap.o Range.o Elf.o | |
50 | ||
51 | -CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR) | |
52 | -LDFLAGS += -lpcre -ljutil -L$(JUTILDIR) | |
1be731f8 | 53 | +override CXXFLAGS += -Wall -I$(JUTILDIR) |
d13e2951 | 54 | +override LDFLAGS += -lpcre -L$(JUTILDIR) -ljutil |
55 | ||
56 | GTKCXXFLAGS = `pkg-config --cflags gtkmm-2.4` | |
57 | GTKLDFLAGS = `pkg-config --libs gtkmm-2.4` | |
58 | diff -Nur o.exmap-0.10/tools/Makefile n.exmap-0.10/tools/Makefile | |
59 | --- o.exmap-0.10/tools/Makefile 2006-09-28 18:52:25.000000000 +0200 | |
60 | +++ n.exmap-0.10/tools/Makefile 2007-02-10 15:38:38.000000000 +0100 | |
61 | @@ -1,6 +1,6 @@ | |
62 | ||
63 | # Some of what we build goes into shared libs, so play safe | |
64 | -CFLAGS=-fPIC | |
65 | +override CFLAGS += -fPIC | |
66 | ||
67 | TS_OBJ = mapper.o | |
68 | EXES += mapper |