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
6 # Note this is the build order, and reflects inter-subdir
8 -SUBDIRS=kernel jutil src tools
9 +SUBDIRS=jutil src tools
11 .PHONY: build clean test $(SUBDIRS)
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
22 -CXXFLAGS=-Wall -Werror -g -I.
25 +override CXXFLAGS += -Wall -I.
27 +override LDFLAGS += -lpcre
29 build: $(LIBS) $(EXES)
31 trun: $(TROBJ) $(JLIB)
32 - $(LD) $(TROBJ) -o trun $(LDFLAGS) -ljutil -L.
33 + $(LD) $(TROBJ) -o trun $(LDFLAGS) -L. -ljutil
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
49 EXMAP_OBJ=Exmap.o Range.o Elf.o
51 -CXXFLAGS += -g -Wall -Werror -I$(JUTILDIR)
52 -LDFLAGS += -lpcre -ljutil -L$(JUTILDIR)
53 +override CXXFLAGS += -Wall -I$(JUTILDIR)
54 +override LDFLAGS += -lpcre -L$(JUTILDIR) -ljutil
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
63 # Some of what we build goes into shared libs, so play safe
65 +override CFLAGS += -fPIC