diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-08-21 15:01:07 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-08-21 15:01:07 -0700 |
| commit | 6155ed8b499c10bdd1f38bcb25866218bc388b7c (patch) | |
| tree | a03b7fbaf122909d9aeab5b1769b661fc3cbbbc6 /Makefile | |
| parent | 1a484d353bc6b48df07473e13de3da27072beaa0 (diff) | |
Re-add amalgamation rules and remove google protobuf from Travis.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -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) |