Get rid of docbook-xsl workaround regarding duplicate empty lines

[grml2usb.git] / Makefile

diff --git a/Makefile b/Makefile
index 9ed8a8a..6951391 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: doc
+all: codecheck doc
 
 doc: doc_man doc_html
 
@@ -16,24 +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
-       # ugly hack to avoid '.sp' at the end of a sentence or paragraph:
-       sed -i 's/\.sp//' 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
-       # ugly hack to avoid '.sp' at the end of a sentence or paragraph:
-       sed -i 's/\.sp//' grml2iso.8
-       rm grml2iso.8.tmp
        # we're done
        touch man-stamp
 
@@ -48,17 +34,16 @@ tarball: all
 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
+       flake8 grml2usb
+       isort --check-only grml2usb
+       black --check grml2usb
 
 # graph:
 #      sudo pycallgraph grml2usb /grml/isos/grml-small_2008.11.iso /dev/sdb1