Browse Source

Use raw .o files rather than -lccan

Rusty Russell 16 years ago
parent
commit
1f2fc89752
1 changed files with 4 additions and 3 deletions
  1. 4 3
      ccan/tdb/tools/Makefile

+ 4 - 3
ccan/tdb/tools/Makefile

@@ -1,4 +1,4 @@
-LDLIBS:=-lccan
+LDLIBS:=../../tdb.o
 CFLAGS:=-I../../.. -Wall -O3 #-g -pg
 CFLAGS:=-I../../.. -Wall -O3 #-g -pg
 LDFLAGS:=-L../../..
 LDFLAGS:=-L../../..
 
 
@@ -7,8 +7,9 @@ default: replay_trace tdbtorture tdbdump tdbtool
 benchmark: replay_trace
 benchmark: replay_trace
 	@trap "rm -f /tmp/trace.$$$$" 0; for f in benchmarks/*.rz; do if runzip -k $$f -o /tmp/trace.$$$$ && echo -n "$$f": && ./replay_trace --quiet -n 5 replay.tdb /tmp/trace.$$$$ && rm /tmp/trace.$$$$; then rm -f /tmp/trace.$$$$; else exit 1; fi; done
 	@trap "rm -f /tmp/trace.$$$$" 0; for f in benchmarks/*.rz; do if runzip -k $$f -o /tmp/trace.$$$$ && echo -n "$$f": && ./replay_trace --quiet -n 5 replay.tdb /tmp/trace.$$$$ && rm /tmp/trace.$$$$; then rm -f /tmp/trace.$$$$; else exit 1; fi; done
 
 
-replay_trace: replay_trace.c keywords.c
-	$(LINK.c) $< $(LOADLIBES) $(LDLIBS) -o $@
+REPLAY_LIBS=$(LDLIBS) ../../str_talloc.o ../../grab_file.o  ../../talloc.o ../../noerr.o
+replay_trace: replay_trace.c keywords.c $(REPLAY_LIBS)
+	$(LINK.c) $< $(LOADLIBES) $(REPLAY_LIBS) -o $@
 
 
 keywords.c: keywords.gperf
 keywords.c: keywords.gperf
 	gperf $< > $@
 	gperf $< > $@