Remove dblatex param=nb, which do not seem to have any effect.

[text-free-culture-lessig.git] / Makefile

diff --git a/Makefile b/Makefile
index 9cf0fdc2eb1cedc3129fa5b98f5c7e37c8879dce..7cb3a5cd3f524a711c249826ec2f85f686f2f5d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,12 @@ DBLATEX = dblatex \
        --backend=xetex \
        --xsl-user=data/user_param.xsl \
        --xsl-user=data/xetex_param.xsl \
-       -p data/pdf.xsl \
-       --param=lingua=nb
+       -p data/pdf.xsl
 
 DBTOEPUB = dbtoepub
 
+IMAGES = images/cc.png
+
 all: lint lint.nb html epub pdf
 
 freeculture.nb.po: freeculture.pot
@@ -31,19 +32,22 @@ pdf: freeculture.nb.pdf freeculture.pdf
 epub: freeculture.nb.epub 
 html: freeculture.html freeculture.nb.html 
 
-%.pdf: %.xml
-       $(DBLATEX) $^ --param=lingua=nb
+%.pdf: %.xml $(IMAGES)
+       $(DBLATEX) $< --param=lingua=nb
 
 # Alternative processing path to dblatex is to use xmlto using fop to
 # create PDF like this.  The PDF output (visual design) is better, but
 # the PDF index and footnote handling is worse and images are missing.
 #      xmlto --noautosize -m xmlto-pdf.xsl --with-fop pdf $^
 
-%.html: %.xml
-       xmlto html-nochunks $^
+%.html: %.xml $(IMAGES)
+       xmlto html-nochunks $<
+
+%.txt: %.xml $(IMAGES)
+       xmlto txt $<
 
-%.epub: %.xml
-       $(DBTOEPUB) $^
+%.epub: %.xml, $(IMAGES)
+       $(DBTOEPUB) $^ $<
 
 freeculture.xml:
        GET $(url) | gunzip > freeculture.xml
@@ -75,4 +79,4 @@ images/cc.svg:
        wget -O $@ http://upload.wikimedia.org/wikipedia/commons/9/97/CC_some_rights_reserved_new_2.svg
 
 images/cc.png: images/cc.svg
-       convert -adaptive-resize 500x200 $^ $@
+       inkscape -z -D --export-height=200 -D --export-png=$(shell pwd)/$@ $^