Simplified use of llvm checker

diff --git a/Make.inc.in b/Make.inc.in
index e1716c8..91345a1 100644 (file)
--- 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 99bf081..827edfb 100644 (file)
--- 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 6b47cd0..17d6393 100644 (file)
--- 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 63b4b5f..771cd14 100644 (file)
--- 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 cd6fbce..e209895 100644 (file)
--- 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