diff -r 5e6df4f502d3 -r 78a25071ed88 docs/src/Makefile --- a/docs/src/Makefile Wed Apr 10 12:54:24 2019 +0200 +++ b/docs/src/Makefile Wed Apr 10 13:48:44 2019 +0200 @@ -28,6 +28,7 @@ PANDOC=pandoc PFLAGS = -c davdoc.css -B header.html -A footer.html +PDEPEND = header.html footer.html PFLAGSMAN=-s -t man SRC = getting-started.md @@ -59,6 +60,7 @@ SRC += pull.md SRC += push.md SRC += archive.md +SRC += list-conflicts.md SRC += resolve-conflicts.md SRC += delete-conflicts.md SRC += trash-info.md @@ -93,16 +95,16 @@ build: mkdir -p build -build/%.html: %.md +build/%.html: %.md $(PDEPEND) $(PANDOC) $(PFLAGS) $< -o $@ build/%.man: %.md $(PANDOC) $(PFLAGSMAN) $< -o $@ -build/davdoc.css: +build/davdoc.css: davdoc.css cp davdoc.css build -build/index.html: +build/index.html: index.html cp index.html build dist: doc manual