haraldwolff
/
json
mirror of https://github.com/nlohmann/json.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move amalgamate tool to third_party folder

pull/911/head
Théo DELRIEU 2018-01-13 13:05:42 +01:00
parent 922b56e492
commit 84bffd5d36
No known key found for this signature in database
GPG Key ID: 51AC4B3A2C47C10F
7 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,4 +21,3 @@ benchmarks/files/numbers/*.json
cmake-build-debug
test/test-*
third_party/Amalgamate

2
Makefile
View File

@ -252,7 +252,7 @@ pretty:
amalgamate: src/json.hpp
src/json.hpp: $(SRCS)
develop/amalgamate/amalgamate.py -c develop/amalgamate/config.json -s develop --verbose=yes
third_party/amalgamate/amalgamate.py -c third_party/amalgamate/config.json -s develop --verbose=yes
$(MAKE) pretty

0
develop/amalgamate/CHANGES.md → third_party/amalgamate/CHANGES.md vendored
View File

0
develop/amalgamate/LICENSE.md → third_party/amalgamate/LICENSE.md vendored
View File

0
develop/amalgamate/README.md → third_party/amalgamate/README.md vendored
View File

0
develop/amalgamate/amalgamate.py → third_party/amalgamate/amalgamate.py vendored 100755 → 100644
View File

0
develop/amalgamate/config.json → third_party/amalgamate/config.json vendored
View File