diff options
| author | Joshua Haberman <joshua@reverberate.org> | 2009-08-27 11:10:13 -0700 |
|---|---|---|
| committer | Joshua Haberman <joshua@reverberate.org> | 2009-08-27 11:10:13 -0700 |
| commit | f17ed90f7704d77e3eb59a6f6b693ab4c598936a (patch) | |
| tree | 48c0b69db3984577d77219eb861783b6bed16d24 /Makefile | |
| parent | b276aa78b6d04a35420ce699ae51771550b97d11 (diff) | |
Some cleanup and reformatting, fixed the benchmarks.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -34,7 +34,7 @@ LDLIBS=-lpthread LIBUPB=src/libupb.a LIBUPB_PIC=src/libupb_pic.a LIBUPB_SHARED=src/libupb.so -ALL=deps $(OBJ) $(LIBUPB) $(LIBUPB_PIC) $(LIBUPB_SHARED) tests/test_table tests/tests tools/upbc +ALL=deps $(OBJ) $(LIBUPB) $(LIBUPB_PIC) tests/test_table tests/tests tools/upbc all: $(ALL) clean: rm -rf $(call rwildcard,,*.o) $(call rwildcard,,*.lo) $(ALL) benchmark/google_messages.proto.pb benchmark/google_messages.pb.* benchmarks/b.* benchmarks/*.pb* @@ -42,8 +42,9 @@ clean: cd lang_ext/python && python setup.py clean --all # The core library (src/libupb.a) -SRC=src/upb_parse.c src/upb_table.c src/upb_msg.c src/upb_mm.c src/upb_enum.c src/upb_context.c \ - src/upb_string.c src/upb_text.c src/upb_serialize.c descriptor/descriptor.c +SRC=src/upb.c src/upb_parse.c src/upb_table.c src/upb_msg.c src/upb_mm.c \ + src/upb_enum.c src/upb_context.c src/upb_string.c src/upb_text.c \ + src/upb_serialize.c descriptor/descriptor.c STATICOBJ=$(patsubst %.c,%.o,$(SRC)) SHAREDOBJ=$(patsubst %.c,%.lo,$(SRC)) # building shared objects is like building static ones, except -fPIC is added. @@ -91,6 +92,7 @@ upb_benchmarks: $(UPB_BENCHMARKS) benchmarks: $(BENCHMARKS) benchmark: @rm -f benchmarks/results + @rm -rf benchmarks/*.dSYM @for test in benchmarks/b.* ; do ./$$test ; done benchmarks/google_messages.proto.pb: benchmarks/google_messages.proto |