Use fwupdate's Make.coverity instead of implementing it inline.

Signed-off-by: Peter Jones <pjones@redhat.com>

diff --git a/Make.coverity b/Make.coverity
new file mode 100644 (file)
index 0000000..bfdca0c
--- /dev/null
+++ b/Make.coverity
@@ -0,0 +1,33 @@
+COV_EMAIL=$(call get-config,coverity.email)
+COV_TOKEN=$(call get-config,coverity.token)
+COV_URL=$(call get-config,coverity.url)
+COV_FILE=$(NAME)-coverity-$(VERSION)-$(COMMIT_ID).tar.bz2
+
+cov-int : clean
+       cov-build --dir cov-int make all
+
+cov-clean :
+       @rm -vf $(NAME)-coverity-*.tar.*
+       @if [[ -d cov-int ]]; then rm -rf cov-int && echo "removed 'cov-int'"; fi
+
+cov-file : | $(COV_FILE)
+
+$(COV_FILE) : cov-int
+       tar caf $@ cov-int
+
+cov-upload :
+       @if [[ -n "$(COV_URL)" ]] &&                                    \
+           [[ -n "$(COV_TOKEN)" ]] &&                                  \
+           [[ -n "$(COV_EMAIL)" ]] ;                                   \
+       then                                                            \
+               echo curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(VERSION).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \
+               curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(VERSION).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \
+       else                                                            \
+               echo Coverity output is in $(COV_FILE) ;                \
+       fi
+
+coverity : cov-file cov-upload
+
+clean : | cov-clean
+
+.PHONY : coverity cov-upload cov-clean cov-file

diff --git a/Make.defaults b/Make.defaults
index 9627cb2..b04a7d8 100644 (file)
--- a/Make.defaults
+++ b/Make.defaults
@@ -40,3 +40,7 @@ ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \
        $(call pkg-config-ccldflags)
 SOFLAGS=-shared
 LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs)
+
+COMMIT_ID=$(shell git log -1 --pretty=%H 2>/dev/null || echo master)
+
+NAME=efivar

diff --git a/Makefile b/Makefile
index 7caeea8..fcbda01 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ TOPDIR = $(shell echo $$PWD)
 include $(TOPDIR)/Make.version
 include $(TOPDIR)/Make.rules
 include $(TOPDIR)/Make.defaults
+include $(TOPDIR)/Make.coverity
 
 SUBDIRS := src docs
 
@@ -32,43 +33,17 @@ a :
                exit 1 ; \
        fi
 
-.PHONY: $(SUBDIRS) a brick coverity cov-upload
+.PHONY: $(SUBDIRS) a brick
 
 GITTAG = $(shell bash -c "echo $$(($(VERSION) + 1))")
 
 efivar.spec : | Makefile Make.version
 
-COV_EMAIL=$(call get-config,coverity.email)
-COV_TOKEN=$(call get-config,coverity.token)
-COV_URL=$(call get-config,coverity.url)
-COV_FILE=efivar-coverity-$(GITTAG)-$(COMMIT_ID).tar.bz2
-COMMIT_ID=$(shell git log -1 --pretty=%H 2>/dev/null || echo master)
-
-cov-int : clean
-       cov-build --dir cov-int make all
-
-$(COV_FILE) : cov-int
-       tar caf $@ cov-int
-
-cov-upload :
-       @if [[ -n "$(COV_URL)" ]] &&                                    \
-           [[ -n "$(COV_TOKEN)" ]] &&                                  \
-           [[ -n "$(COV_EMAIL)" ]] ;                                   \
-       then                                                            \
-               echo curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(GITTAG).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \
-               curl --form token=$(COV_TOKEN) --form email="$(COV_EMAIL)" --form file=@"$(COV_FILE)" --form version=$(GITTAG).1 --form description="$(COMMIT_ID)" "$(COV_URL)" ; \
-       else                                                            \
-               echo Coverity output is in $(COV_FILE) ;                \
-       fi
-
-coverity : $(COV_FILE) cov-upload
-
 clean :
        @set -e ; for x in $(SUBDIRS) ; do \
                $(MAKE) -C $$x $@ ; \
        done
        @rm -vf efivar.spec
-       @rm -vrf cov-int efivar-coverity-*.tar.*
 
 test-archive: abicheck efivar.spec
        @rm -rf /tmp/efivar-$(GITTAG) /tmp/efivar-$(GITTAG)-tmp