Simplified use of llvm checker

diff --git a/Make.inc.in b/Make.inc.in
index e1716c8782ab99f74b817cbd5c5e630a28c9c147..91345a11551aae2bbc6c7bb9acfabf3b6345ca99 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 99bf08167784a0d3a3d634bde7f8e3607cbe5105..827edfb9d74cb4ba0214b6563f3e556843bcb18a 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 6b47cd0746a4bad536770edf47c82f919b5f7b22..17d6393db0d35cc568500b7ed469ee55f50637df 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 63b4b5fae08d4674807d8b361b726da2be1ce6c1..771cd1425a126a2fe078326e68ead71c8089d002 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 cd6fbcef9d9b16ce4dabc0723765f94ec5206b31..e2098956557235896ef3a7556dd1f995774f439e 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