From 70293f5faabe08fc9bdef26ad0b1d6afe19e8f79 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Sat, 11 May 2013 17:56:13 -0700
Subject: Open source fixes: builds on OS X again.

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c5df799..787b2cd 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ CXX=g++
 CFLAGS=-std=gnu99
 CXXFLAGS=-Ibindings/cpp
 INCLUDE=-Itests -I.
-CPPFLAGS=$(INCLUDE) -Wall -Wextra $(USER_CFLAGS)
+CPPFLAGS=$(INCLUDE) -Wall -Wextra -Wno-sign-compare $(USER_CFLAGS)
 LDLIBS=-lpthread upb/libupb.a
 LUA=lua5.1  # 5.1 and 5.2 should both be supported
 
@@ -82,7 +82,7 @@ deps: Makefile $(ALLSRC)
 
 # The core library.
 CORE= \
-  upb/bytestream.c \
+  upb/bytestream.upb.c \
   upb/def.c \
   upb/descriptor/reader.c \
   upb/descriptor/descriptor.upb.c \
@@ -101,9 +101,10 @@ CORE= \
 PB= \
   upb/pb/decoder.c \
   upb/pb/glue.c \
-  upb/pb/textprinter.c \
   upb/pb/varint.c \
 
+  #upb/pb/textprinter.c \
+
 
 # Rules. #######################################################################
 
@@ -247,7 +248,8 @@ $(SIMPLE_CXX_TESTS): % : %.cc
 	$(E) CXX $<
 	$(Q) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ tests/testmain.o $< $(LIBUPB)
 
-VALGRIND=valgrind --leak-check=full --error-exitcode=1
+#VALGRIND=valgrind --leak-check=full --error-exitcode=1 --track-origins=yes
+VALGRIND=
 test: tests
 	@echo Running all tests under valgrind.
 	@set -e  # Abort on error.
-- 
cgit v1.2.3