diff --git a/Makefile b/Makefile index a9e0191..2980f0b 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ obj = $(src:.c=.o) uECC.o LIBCBOR = tinycbor/lib/libtinycbor.a LDFLAGS = -Wl,--gc-sections $(LIBCBOR) -CFLAGS = -O2 -fdata-sections -ffunction-sections +CFLAGS = -O2 -fdata-sections -ffunction-sections INCLUDES = -I./tinycbor/src -I./crypto/sha256 -I./crypto/micro-ecc/ -Icrypto/tiny-AES-c/ -I./fido2/ -I./pc -I./fido2/extensions @@ -31,7 +31,7 @@ name = main all: python-fido2 main .PHONY: test -test: +test: $(MAKE) -C . main $(MAKE) -C . testgcm ./testgcm @@ -55,7 +55,7 @@ efm8prog: efm32com: cd './targets/efm32/GNU ARM v7.2.1 - Debug' && $(MAKE) all efm32prog: efm32com - commander flash './targets/efm32/GNU ARM v7.2.1 - Debug/EFM32.hex' $(EFM32_DEBUGGER) -p "0x1E7FC:0x00000000:4" + commander flash './targets/efm32/GNU ARM v7.2.1 - Debug/EFM32.hex' $(EFM32_DEBUGGER) -p "0x1E7FC:0x00000000:4" efm32read: efm32com commander swo read $(EFM32_DEBUGGER) efm32bootprog: efm32com @@ -64,10 +64,10 @@ efm32bootprog: efm32com $(name): $(obj) $(LIBCBOR) $(CC) $(LDFLAGS) -o $@ $(obj) $(LDFLAGS) -crypto/aes-gcm/aes_gcm.o: +crypto/aes-gcm/aes_gcm.o: $(CC) -c crypto/aes-gcm/aes_gcm.c $(CFLAGS) -DTEST -o crypto/aes-gcm/aes_gcm.o -testgcm: $(obj) $(LIBCBOR) crypto/aes-gcm/aes_gcm.o +testgcm: $(obj) $(LIBCBOR) crypto/aes-gcm/aes_gcm.o $(CC) -c fido2/main.c $(CFLAGS) -DTEST -o fido2/main.o $(CC) $(LDFLAGS) -o $@ $^ $(LDFLAGS) @@ -86,11 +86,11 @@ venv: echo " pip install virtualenv" ;\ fi virtualenv venv - ./venv/bin/pip install wheel + ./venv/bin/pip install wheel .PHONY: python-fido2 python-fido2: venv - cd python-fido2/ && ../venv/bin/python setup.py install + cd python-fido2/ && ../venv/bin/python setup.py install venv/bin/mkdocs: venv ./venv/bin/pip install mkdocs mkdocs-material @@ -111,4 +111,3 @@ clean: fi ;\ done rm -rf venv - diff --git a/docs/documenting.md b/docs/documenting.md index 012d8d1..f55a718 100644 --- a/docs/documenting.md +++ b/docs/documenting.md @@ -2,6 +2,10 @@ Documentation of the `master` branch is deployed to Netlify automatically. To host or develop locally: -- `make docsrv` and visit [localhost:8000](http://localhost:8000). +``` +pip install mkdocs mkdocs-material +``` + +`make docsrv` and visit [localhost:8000](http://localhost:8000). The file `runtime.txt` is necessary to tell Netlify to use Python3.