X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=Makefile;h=6951391a9a24ab7543ab3a3432dccf218f311158;hp=b8f1e055a17c7ba3e02bfbe3ad0683398490b232;hb=263374b8b55e98a468f13192eeec97adbf48f3d0;hpb=bb3505dbe24c23d20811e68b48807791195e88bd

diff --git a/Makefile b/Makefile
index b8f1e05..6951391 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: doc
+all: codecheck doc
 
 doc: doc_man doc_html
 
@@ -16,20 +16,10 @@ man-stamp: grml2usb.8.txt grml2iso.8.txt
 	asciidoc -d manpage -b docbook grml2usb.8.txt
 	sed -i 's/<emphasis role="strong">/<emphasis role="bold">/' grml2usb.8.xml
 	xsltproc --novalid --nonet /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl grml2usb.8.xml
-	# ugly hack to avoid duplicate empty lines in manpage
-	# notice: docbook-xsl 1.71.0.dfsg.1-1 is broken! make sure you use 1.68.1.dfsg.1-0.2!
-	cp grml2usb.8 grml2usb.8.tmp
-	uniq grml2usb.8.tmp > grml2usb.8
-	rm grml2usb.8.tmp
 	# grml2iso:
 	asciidoc -d manpage -b docbook grml2iso.8.txt
 	sed -i 's/<emphasis role="strong">/<emphasis role="bold">/' grml2iso.8.xml
 	xsltproc --novalid --nonet /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl grml2iso.8.xml
-	# ugly hack to avoid duplicate empty lines in manpage
-	# notice: docbook-xsl 1.71.0.dfsg.1-1 is broken! make sure you use 1.68.1.dfsg.1-0.2!
-	cp grml2iso.8 grml2iso.8.tmp
-	uniq grml2iso.8.tmp > grml2iso.8
-	rm grml2iso.8.tmp
 	# we're done
 	touch man-stamp
 
@@ -45,16 +35,15 @@ prepare-release:
 	./tarball.sh --no-gpg
 
 clean:
+	$(MAKE) -C mbr clean
 	rm -rf grml2usb.8.html grml2usb.8.xml grml2usb.8
 	rm -rf grml2iso.8.html grml2iso.8.xml grml2iso.8
 	rm -rf html-stamp man-stamp grml2usb.tar.gz grml2usb.tgz grml2usb.tgz.md5.asc
 
 codecheck:
-	pyflakes grml2usb
-	pylint --include-ids=y --max-line-length=120 grml2usb
-	# pylint --include-ids=y --disable-msg-cat=C0301 --disable-msg-cat=W0511 grml2usb
-	# pylint --reports=n --include-ids=y --disable-msg-cat=C0301 grml2usb
-	pep8 --repeat --ignore E125,E126,E127,E128,E501 grml2usb
+	flake8 grml2usb
+	isort --check-only grml2usb
+	black --check grml2usb
 
 # graph:
 #	sudo pycallgraph grml2usb /grml/isos/grml-small_2008.11.iso /dev/sdb1