diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-09-09 14:03:25 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-11-29 17:56:13 +0000 |
| commit | 4b0c4ca7fb0aa9207af3398e04534b23fbb88f27 (patch) | |
| tree | 045750c6262e74f366ae2ec29797d3816005c21a /Makefile | |
| parent | 77c97fd3f29caa5c243294b5f4e6763b3ed3c36f (diff) | |
New upb_msg code and Lua bindings around it.
There are still some things that are unfinished,
but we are at parity with what Lua had before.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -33,7 +33,7 @@ all: lib tests tools/upbc lua python testall: test pythontest # Set this to have user-specific flags (especially things like -O0 and -g). -USER_CPPFLAGS?= +USER_CPPFLAGS?=-O0 -g -ffunction-sections -fdata-sections -I/usr/include/lua5.2 -UNDEBUG # Build with "make WITH_JIT=yes" (or anything besides "no") to enable the JIT. WITH_JIT=no @@ -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 \ @@ -479,9 +479,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 |