j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

📝 overworked documentation wrt. amalgamation #906

Browse source
This commit is contained in:
Niels Lohmann 2018-01-14 13:08:28 +01:00
parent fea5f3792b
commit 411c16cbb2
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
5 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -32,7 +32,7 @@ all:
@echo "amalgamate - amalgamate file src/json.hpp from the develop sources"
@echo "ChangeLog.md - generate ChangeLog file"
@echo "check - compile and execute test suite"
@echo "check-amalagamation - check whether sources have been amalgamated"
@echo "check-amalgamation - check whether sources have been amalgamated"
@echo "check-fast - compile and execute test suite (skip long-running tests)"
@echo "clean - remove built files"
@echo "coverage - create coverage information with lcov"
@ -258,7 +258,7 @@ src/json.hpp: $(SRCS)
$(MAKE) pretty
# check if src/json.hpp has been amalgamated from the develop sources
check-amalagamation:
check-amalgamation:
@mv src/json.hpp src/json.hpp~
@$(MAKE) amalgamate
@diff src/json.hpp src/json.hpp~ || (echo "===================================================================\n Amalgamation required! Please read the contribution guidelines\n in file .github/CONTRIBUTING.md.\n===================================================================" ; mv src/json.hpp~ src/json.hpp ; false)