From 6155ed8b499c10bdd1f38bcb25866218bc388b7c Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Tue, 21 Aug 2018 15:01:07 -0700
Subject: Re-add amalgamation rules and remove google protobuf from Travis.

---
 Makefile | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1bf5a39..f78c950 100644
--- a/Makefile
+++ b/Makefile
@@ -437,3 +437,17 @@ upb/bindings/lua/upb/table_c.so: upb/bindings/lua/upb/table.c lib/libupb_pic.a
 upb/bindings/lua/upb/pb_c.so: upb/bindings/lua/upb/pb.c $(LUA_LIB_DEPS)
 	$(E) CC upb/bindings/lua/upb/pb.c
 	$(Q) $(CC) $(OPT) $(CSTD) $(WARNFLAGS) $(CPPFLAGS) $(CFLAGS) -fpic -shared -o $@ $^ $(LUA_LDFLAGS)
+
+# Amalgamated source (upb.c/upb.h) ############################################
+
+AMALGAMATE_SRCS=$(upb_SRCS) $(upb_descriptor_SRCS) $(upb_pb_SRCS) $(upb_json_SRCS)
+
+amalgamate: upb.c upb.h
+
+upb.c upb.h: $(AMALGAMATE_SRCS)
+	$(E) AMALGAMATE $@
+	$(Q) ./tools/amalgamate.py "" "" $^
+
+amalgamated: upb.c upb.h
+	$(E) CC upb.c
+	$(Q) $(CC) -o upb.o -c upb.c $(WARNFLAGS)
-- 
cgit v1.2.3