diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-12-07 17:07:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-07 17:07:05 -0800 |
| commit | 076a82ee7edf35fb5f2a3430535e21a6dbd4cd6d (patch) | |
| tree | 87969c375756dc4290478c9ecc5d0d87ae48f557 /Makefile | |
| parent | 9a91f7bba8c89ed4d1cb0d56b8a394a9590df029 (diff) | |
| parent | 2b77da3da8234484ebc099c560671ea21ab7181b (diff) | |
Merge pull request #74 from haberman/msg
Added upb_msg and Lua bindings for using it.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -150,8 +150,8 @@ make_objs_cc = $$(patsubst upb/$$(pc).cc,obj/upb/$$(pc).$(1),$$($$(call to_srcs, upb_SRCS = \ upb/def.c \ upb/handlers.c \ + upb/msg.c \ upb/refcounted.c \ - upb/shim/shim.c \ upb/symtab.c \ upb/table.c \ upb/upb.c \ @@ -250,6 +250,8 @@ obj/upb/%.lo: upb/%.cc | $$(@D)/. # Regenerating the auto-generated files in upb/. upb/descriptor/descriptor.pb: upb/descriptor/descriptor.proto + $(E) PROTOC upb/descriptor/descriptor.proto + $(Q) protoc upb/descriptor/descriptor.proto -oupb/descriptor/descriptor.pb # "genfiles" includes Proto schemas we need for tests # For the moment we check in the *.upbdefs.* generated files so that people @@ -479,9 +481,9 @@ LUA_LIB_DEPS = \ lib/libupb.descriptor_pic.a \ lib/libupb_pic.a \ -upb/bindings/lua/upb_c.so: upb/bindings/lua/upb.c $(LUA_LIB_DEPS) - $(E) CC upb/bindings/lua/upb.c - $(Q) $(CC) $(OPT) $(CSTD) $(WARNFLAGS) $(CPPFLAGS) $(CFLAGS) -fpic -shared -o $@ $< $(LUA_LDFLAGS) $(LUA_LIB_DEPS) +upb/bindings/lua/upb_c.so: upb/bindings/lua/upb.c upb/bindings/lua/def.c upb/bindings/lua/msg.c $(LUA_LIB_DEPS) + $(E) 'CC upb/bindings/lua/{upb,def,msg}.c' + $(Q) $(CC) $(OPT) $(CSTD) $(WARNFLAGS) $(CPPFLAGS) $(CFLAGS) -fpic -shared -o $@ $^ $(LUA_LDFLAGS) upb/bindings/lua/upb/table_c.so: upb/bindings/lua/upb/table.c lib/libupb_pic.a $(E) CC upb/bindings/lua/upb/table.c |