From 80b99d2efbbc5f5f06b7ce6cd2a95140b3e9550a Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Mon, 5 Nov 2018 06:31:43 -0500
Subject: [PATCH] make format and parallelize analyze target in makefile

---
 Makefile                   | 12 ++++++++----
 include/llarp/net_addr.hpp |  2 +-
 llarp/net_addr.cpp         |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 104865825..5904419db 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ BUILD_ROOT = $(REPO)/build
 CONFIG_CMD = $(shell /bin/echo -n "cd '$(BUILD_ROOT)' && " ; /bin/echo -n "cmake -DUSE_CXX17=$(CXX17) -DUSE_LIBABYSS=$(JSONRPC) '$(REPO)'")
 
 SCAN_BUILD ?= scan-build
-ANALYZE_CMD = $(shell /bin/echo -n "cd '$(BUILD_ROOT)' && " ; /bin/echo -n "$(SCAN_BUILD) cmake -DUSE_LIBABYSS=$(JSONRPC) '$(REPO)' && cd '$(BUILD_ROOT)' && $(SCAN_BUILD) $(MAKE)")
+ANALYZE_CONFIG_CMD = $(shell /bin/echo -n "cd '$(BUILD_ROOT)' && " ; /bin/echo -n "$(SCAN_BUILD) cmake -DUSE_LIBABYSS=$(JSONRPC) '$(REPO)'")
 
 TARGETS = $(REPO)/lokinet
 SIGS = $(TARGETS:=.sig)
@@ -133,14 +133,18 @@ abyss: debug
 format:
 	clang-format -i $$(find daemon llarp include libabyss | grep -E '\.[h,c](pp)?$$')
 
-analyze: clean
+analyze-config: clean
 	mkdir -p '$(BUILD_ROOT)'
-	$(ANALYZE_CMD)
+	$(ANALYZE_CONFIG_CMD)
+
+analyze: analyze-config
+	cd '$(BUILD_ROOT)'
+	$(SCAN_BUILD) $(MAKE)
 
 lint: $(LINT_CHECK)
 
 %.cpp-check: %.cpp
-	clang-tidy $^ -- -I$(REPO)/include -I$(REPO)/crypto/libntrup/include -I$(REPO)/llarp
+	clang-tidy $^ -- -I$(REPO)/include -I$(REPO)/crypto/include -I$(REPO)/llarp -I$(REPO)/vendor/cppbackport-master/lib
 
 docker-debian:
 	docker build -f docker/debian.Dockerfile .
diff --git a/include/llarp/net_addr.hpp b/include/llarp/net_addr.hpp
index baf375f8f..65b693cf2 100644
--- a/include/llarp/net_addr.hpp
+++ b/include/llarp/net_addr.hpp
@@ -65,7 +65,7 @@ namespace llarp
     Addr(const sockaddr_in& other);
     Addr(const sockaddr_in6& other);
     Addr(const sockaddr& other);
-    
+
     std::string
     ToString() const;
 
diff --git a/llarp/net_addr.cpp b/llarp/net_addr.cpp
index 8501045c1..ec7a02c9f 100644
--- a/llarp/net_addr.cpp
+++ b/llarp/net_addr.cpp
@@ -295,7 +295,7 @@ namespace llarp
         break;
     }
   }
-  
+
   std::string
   Addr::ToString() const
   {