Skip to content

Commit

Permalink
Move talloc to lib/
Browse files Browse the repository at this point in the history
.. other objects (eg, tests) may want to use it...

Signed-off-by: Jeremy Kerr <[email protected]>
  • Loading branch information
jk-ozlabs committed Jun 16, 2008
1 parent 6fb11d8 commit 2b2307e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,32 @@
# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

CC=gcc
CFLAGS=-Wall -Werror -g -O2
CFLAGS=-Wall -Werror -g -O2 -Ilib/include
LDFLAGS=

MAKEFLAGS=--no-print-directory

all: tests benchmarks

.PHONY: tests benchmarks
.PHONY: tests benchmarks libs

tests benchmarks: bin/run-tests lib/slowfs/slowfs
$(MAKE) -C $@ all


bin/run-tests: bin/talloc/talloc.o bin/run-tests.o bin/capabilities.o bin/test.o
bin/run-tests: lib/talloc/talloc.o bin/run-tests.o bin/capabilities.o bin/test.o
$(LINK.o) -o $@ $^

libs: lib/talloc/talloc.o

lib/slowfs/slowfs: CFLAGS += $(shell pkg-config fuse --cflags)
lib/slowfs/slowfs: LDFLAGS += $(shell pkg-config fuse --libs)

clean:
cd tests && make clean
cd benchmarks && make clean
rm -f bin/capabilities bin/run-tests
rm -f bin/*.o bin/talloc/talloc.o
rm -f bin/*.o lib/talloc/talloc.o

check: clean all
bin/run-tests
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/talloc/talloc.c → lib/talloc/talloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include <string.h>
#include <stdarg.h>

#include "talloc.h"
#include <talloc/talloc.h>

/* use this to force every realloc to change the pointer, to stress test
code that might not cope */
Expand Down

0 comments on commit 2b2307e

Please sign in to comment.