summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-15 22:08:22 (GMT)
commita14a9bfc132f8fe80cca33d14b1acbcda945de13 (patch)
tree82bbfba41374f8e350b9a7146740a3763b54cdeb /Makefile
parent8cabe16d9f96e99aec2264b9e468e42fb61e4668 (diff)
parent75459410edd8d3bf38a2f1ad785f54b97770b324 (diff)
downloadgit-a14a9bfc132f8fe80cca33d14b1acbcda945de13.zip
git-a14a9bfc132f8fe80cca33d14b1acbcda945de13.tar.gz
git-a14a9bfc132f8fe80cca33d14b1acbcda945de13.tar.bz2
Merge branch 'jh/json-writer'
Preparatory code to later add json output for telemetry data. * jh/json-writer: json_writer: new routines to create JSON data
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5f569c9..8251c39 100644
--- a/Makefile
+++ b/Makefile
@@ -714,6 +714,7 @@ TEST_BUILTINS_OBJS += test-example-decorate.o
TEST_BUILTINS_OBJS += test-genrandom.o
TEST_BUILTINS_OBJS += test-hashmap.o
TEST_BUILTINS_OBJS += test-index-version.o
+TEST_BUILTINS_OBJS += test-json-writer.o
TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
TEST_BUILTINS_OBJS += test-match-trees.o
TEST_BUILTINS_OBJS += test-mergesort.o
@@ -878,6 +879,7 @@ LIB_OBJS += hashmap.o
LIB_OBJS += help.o
LIB_OBJS += hex.o
LIB_OBJS += ident.o
+LIB_OBJS += json-writer.o
LIB_OBJS += kwset.o
LIB_OBJS += levenshtein.o
LIB_OBJS += line-log.o