diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 17:03:49 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 17:03:49 +0200 |
| commit | 9866002f3f569f6da886d71964d3298183cd1646 (patch) | |
| tree | 968097e2f5fa11a094238ead6469739a725d8ce2 /docs/Makefile | |
| parent | 37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3 (diff) | |
| parent | 6f12303cf4c4130d544c30f8ad5e2445a1fa3e61 (diff) | |
| download | libuca-9866002f3f569f6da886d71964d3298183cd1646.tar.gz libuca-9866002f3f569f6da886d71964d3298183cd1646.tar.bz2 libuca-9866002f3f569f6da886d71964d3298183cd1646.tar.xz libuca-9866002f3f569f6da886d71964d3298183cd1646.zip | |
Merge remote branch 'origin/master' into dexela
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/uca-camera.c
Diffstat (limited to 'docs/Makefile')
| -rw-r--r-- | docs/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/Makefile b/docs/Makefile index 53dc6fd..ff7113d 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -10,11 +10,15 @@ html: manual.html clean: rm -f manual.pdf manual.html -manual.pdf: manual.md - $(PANDOC) $(OPTS) manual.md -o manual.pdf +manual.pdf: manual.md gen-changelog + ./gen-changelog + $(PANDOC) $(OPTS) manual.md z-changes-*.md -o manual.pdf + rm z-changes-*.md -manual.html: manual.md style.css - $(PANDOC) $(OPTS) manual.md -H webfonts.html -c style.css -o manual.html +manual.html: manual.md style.css gen-changelog + ./gen-changelog + $(PANDOC) $(OPTS) manual.md z-changes-*.md -H webfonts.html -c style.css -o manual.html + rm z-changes-*.md ifeq ($(PANDOC),) $(warning Pandoc not found!) |