From c0d32bd24dd212ac55d83f8b915c70ae132a475d Mon Sep 17 00:00:00 2001
From: "Alan T. DeKok" <aland@freeradius.org>
Date: Thu, 17 Dec 2009 09:35:35 +0100
Subject: [PATCH] Simplified use of llvm checker

---
 Make.inc.in           | 9 ++++-----
 src/lib/Makefile      | 4 ----
 src/main/Makefile.in  | 4 ----
 src/modules/Makefile  | 4 ----
 src/modules/rules.mak | 4 ----
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/Make.inc.in b/Make.inc.in
index e1716c8782a..91345a11551 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -100,10 +100,9 @@ endif
 
 #  http://clang.llvm.org/StaticAnalysis.html
 #
-#  $ make scan | sed "s/.*Run '//;s/'.*//" > scan.sh
-#  $ ./scan.sh
+#  $ make SCAN=/path/to/checker/ 
 #
-SCAN_BUILD	= /path/to/checker-0.167/scan-build
-ifeq ($(SCAN),yes)
-CC		:= $(SCAN_BUILD) gcc -DFR_SCAN_BUILD
+ifne ($(SCAN),)
+CC		:= $(SCAN)/scan-build gcc -DFR_SCAN_BUILD
+LIBTOOL		:= 
 endif
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 99bf0816778..827edfb9d74 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -55,7 +55,3 @@ install: all
 		$(R)$(libdir)/$(TARGET).la
 	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
 	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-
-.PHONY: scan
-scan:
-	@[ "$(SCAN_BUILD)" == "" ] || ($(MAKE) SCAN=yes LIBTOOL= 2>&1) | grep 'scan-view' || true
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 6b47cd0746a..17d6393db0d 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -148,7 +148,3 @@ endif
 	$(INSTALL) -m 755    radlast			$(R)$(bindir)
 	$(INSTALL) -m 755    radtest 			$(R)$(bindir)
 	$(INSTALL) -m 755    radzap			$(R)$(bindir)
-
-.PHONY: scan
-scan:
-	@[ "$(SCAN_BUILD)" == "" ] || ($(MAKE) SCAN=yes LIBTOOL= 2>&1) | grep 'scan-view' || true
diff --git a/src/modules/Makefile b/src/modules/Makefile
index 63b4b5fae08..771cd1425a1 100644
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -50,7 +50,3 @@ common:
 			$(MAKE) $(MFLAGS) -C $$mod $(WHAT_TO_MAKE) || exit $$?; \
 		fi; \
 	done
-
-.PHONY: scan
-scan:
-	@[ "$(SCAN_BUILD)" == "" ] || ($(MAKE) SCAN=yes LIBTOOL= WHAT_TO_MAKE=scan common 2>&1) | grep 'scan-build' || true
diff --git a/src/modules/rules.mak b/src/modules/rules.mak
index cd6fbcef9d9..e2098956557 100644
--- a/src/modules/rules.mak
+++ b/src/modules/rules.mak
@@ -174,7 +174,3 @@ install:
 	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
 	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
 	fi
-
-.PHONY: scan
-scan:
-	@[ "$(SCAN_BUILD)" == "" ] || ($(MAKE) SCAN=yes LIBTOOL= 2>&1) | grep 'scan-view' || true
-- 
2.47.3