diff options
| author | Joshua Haberman <joshua@reverberate.org> | 2009-07-21 17:36:02 -0700 |
|---|---|---|
| committer | Joshua Haberman <joshua@reverberate.org> | 2009-07-21 17:36:02 -0700 |
| commit | a1a9596d02f5297d60448edac994c2bcb56edc4a (patch) | |
| tree | e583f07c1d141e4fd6a3b73fab6fc2c4e3d0c14e /Makefile | |
| parent | 40e8127a246c2ec6bf5a7f981c90c0dbf4e37161 (diff) | |
Fix tests and the build (though a few tests are failing).
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -3,14 +3,15 @@ CC=gcc CXX=g++ CFLAGS=-std=c99 -CPPFLAGS=-O0 -Wall -Wextra -pedantic -g -DUPB_UNALIGNED_READS_OK -DNDEBUG -Idescriptor -Isrc -Itests -I. +INCLUDE=-Idescriptor -Isrc -Itests -I. +CPPFLAGS=-O3 -fomit-frame-pointer -Wall -Wextra -g -DUPB_UNALIGNED_READS_OK -DNDEBUG $(INCLUDE) OBJ=src/upb_parse.o src/upb_table.o src/upb_msg.o src/upb_enum.o src/upb_context.o \ - src/upb_string.o descriptor/descriptor.o -SRC=src/*.c src/*.h descriptor/*.c descriptor/*.h tests/*.c tests/*.h tools/*.c tools/*.h + src/upb_string.o src/upb_text.o descriptor/descriptor.o +SRC=src/*.c src/*.h descriptor/*.c descriptor/*.h tests/*.c tests/*.h tools/*.c ALL=$(OBJ) src/libupb.a tests/test_table tests/tests tools/upbc benchmark/benchmark all: $(ALL) clean: - rm -f $(ALL) deps benchmark/google_messages.proto.pb benchmark/google_messages.pb.* + rm -f $(ALL) benchmark/google_messages.proto.pb benchmark/google_messages.pb.* src/libupb.a: $(OBJ) ar rcs src/libupb.a $(OBJ) @@ -18,9 +19,5 @@ tests/test_table: src/libupb.a tools/upbc: src/libupb.a benchmark/benchmark: src/libupb.a benchmark/google_messages.pb.h benchmark/google_messages.pb.o benchmark/benchmark.o $(CXX) $(CPPFLAGS) -o benchmark/benchmark benchmark/google_messages.pb.o benchmark/benchmark.cc src/libupb.a -lm -lprotobuf -lpthread -benchmark/google_messages.pb.h benchmark/google_messages.pb: benchmark/google_messages.proto +benchmark/google_messages.pb.cc benchmark/google_messages.pb.h benchmark/google_messages.pb: benchmark/google_messages.proto protoc benchmark/google_messages.proto --cpp_out=. -obenchmark/google_messages.proto.pb - --include deps -deps: $(SRC) - gcc -MM $(SRC) > deps |