commit eaa72f6448b5af43dc65cffedc0ee5a45c3292be
parent 58326317224877f0c37cc4682332db906265e62b
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 3 Aug 2022 19:31:09 +0200
move make
Diffstat:
2 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,24 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS ?=
-SPHINXBUILD ?= sphinx-build
-SOURCEDIR = .
-BUILDDIR = _build
-
-all: html
-
-.PHONY: distdir uninstall install all help Makefile
-
-# TODO implement install uninstall and distdir(?)
-
-# Put it first so that "make" without argument is like "make help".
-help:
- @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
- @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/Makefile.am b/Makefile.am
@@ -8,9 +8,9 @@ SPHINXBUILD ?= sphinx-build
SOURCEDIR = .
BUILDDIR = _build
-all: html
+all: html man
-.PHONY: distdir uninstall install all help Makefile
+.PHONY: all help Makefile
# TODO implement install uninstall and distdir(?)
@@ -18,11 +18,16 @@ all: html
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-gnunet.1: Makefile man
+_build/man/gnunet.1: Makefile man
-man_MANS = gnunet.1
+man_MANS = _build/man/gnunet.1
+
+html: Makefile
+ @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+man: Makefile
+ @$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)# Catch-all target: route all unknown targets to Sphinx using the new
-# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
- @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+#%: Makefile
+# @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
