From 5c1b6f15521920a555462870ede0f61961d95fe7 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Mon, 26 Oct 2020 06:39:46 +0800 Subject: [PATCH] Move Makefile to the talk directory It is no longer needed outside this directory since it has mostly been replaced by setup.py. Always build the talk HTML, now that the Makefile is in a subdir, since subdir builds only happen when explicitly requested. Update the documentation to match the new build setup. --- Makefile | 8 -------- doc/presentations/GitMerge-2013/Makefile | 6 ++++++ doc/presentations/GitMerge-2013/README.txt | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 Makefile create mode 100644 doc/presentations/GitMerge-2013/Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index a5e775f..0000000 --- a/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -all: - -module := doc/presentations/GitMerge-2013 - -html: $(module)/talk.html - -$(module)/talk.html: $(module)/talk.rst - rst2s5 --theme=small-white --current-slide $< $@ diff --git a/doc/presentations/GitMerge-2013/Makefile b/doc/presentations/GitMerge-2013/Makefile new file mode 100644 index 0000000..1bf24c0 --- /dev/null +++ b/doc/presentations/GitMerge-2013/Makefile @@ -0,0 +1,6 @@ +all: html + +html: talk.html + +talk.html: talk.rst + rst2s5 --theme=small-white --current-slide $< $@ diff --git a/doc/presentations/GitMerge-2013/README.txt b/doc/presentations/GitMerge-2013/README.txt index 23ff477..c31709e 100644 --- a/doc/presentations/GitMerge-2013/README.txt +++ b/doc/presentations/GitMerge-2013/README.txt @@ -4,6 +4,6 @@ on "User Day". (I gave another, more technical talk on a whiteboard the day before at "Developer Day".) -To convert it into HTML, run "make html" in the top-level directory. +To convert it into HTML, run "make html" in this directory. -- Michael Haggerty