summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2014-12-12 15:22:55 -0800
committerJoshua Haberman <jhaberman@gmail.com>2014-12-12 15:22:55 -0800
commitefffb86a5ceb7e5ca4c96b2061744958e455192e (patch)
tree2b51257e4b9cebfc3640d98cda45f9b8be36fdb2 /Makefile
parent56913be6bb57f81dbbf7baf9cc9a0a2cd1a36493 (diff)
parentb3f6daf83d8adf0040a1bf9401342c811502f690 (diff)
Merge pull request #8 from cfallin/master
Amalgamated distribution (upb.c/upb.h) tool.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 96bb1a7..8913752 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
# Threading:
# * -DUPB_THREAD_UNSAFE: remove all thread-safety.
-.PHONY: all lib clean tests test benchmark descriptorgen
+.PHONY: all lib clean tests test benchmark descriptorgen amalgamate
.PHONY: clean_leave_profile
# Prevents the deletion of intermediate files.
@@ -462,3 +462,13 @@ $(RUBYEXT): upb/bindings/ruby/upb.c upb/bindings/ruby/Makefile
rubytest: $(RUBYEXT) upb/descriptor/descriptor.pb
RUBYLIB="upb/bindings/ruby" ruby tests/bindings/ruby/upb.rb
+
+# 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 "" "" $^
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback