From 90bb4246c34580eb6c8a5a41a4e19fcd5f334f09 Mon Sep 17 00:00:00 2001
From: Josh Haberman <haberman@google.com>
Date: Sat, 25 May 2013 10:26:59 -0700
Subject: Synced with Google-internal development.

C++ handlers are now type-safe; SinkFrame is gone.
Various other changes.
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c5df799..4f8bf2e 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 \
@@ -90,6 +90,7 @@ CORE= \
   upb/google/proto2.cc \
   upb/handlers.c \
   upb/refcounted.c \
+  upb/shim/shim.c \
   upb/sink.c \
   upb/symtab.c \
   upb/table.c \
-- 
cgit v1.2.3