commit c8cb9262ba1102b2cad457f38108fce2fd412ed2 parent be118c2920f5d3f597981b5da0f60d1443ff16a6 Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Sun, 7 Aug 2022 14:56:06 +0200 revert to old behaviour Diffstat:
| A | Makefile | | | 19 | +++++++++++++++++++ |
| D | Makefile.am | | | 63 | --------------------------------------------------------------- |
2 files changed, 19 insertions(+), 63 deletions(-)
diff --git a/Makefile b/Makefile @@ -0,0 +1,19 @@ +# 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 + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# "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 @@ -1,63 +0,0 @@ -# Minimal makefile for Sphinx documentation -# -docdir = $(datadir)/doc/gnunet/ - -# 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 - -.PHONY: all help Makefile - -all: html man info - -# 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) - -_build/man/gnunet.1: Makefile man - -man_MANS = _build/man/gnunet.1 - -clean: - rm -rf $(BUILDDIR) - -EXTRA_DIST = \ - about.rst \ - conf.py \ - faq.rst \ - gana.rst \ - guis \ - index.rst \ - installing.rst \ - livingstandards.rst \ - make.bat \ - man_developers \ - man_users \ - preface.rst \ - _static - -install-data-hook: - mkdir -p $(DESTDIR)$(docdir) - cp -pr $(BUILDDIR)/html $(DESTDIR)$(docdir) - install -m 0755 $(BUILDDIR)/texinfo/gnunet.info $(DESTDIR)/$(infodir) - -html: Makefile - @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -man: Makefile - @$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -info: Makefile - @$(SPHINXBUILD) -M info "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -pdf: Makefile - @$(SPHINXBUILD) -M pdf "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). -#%: Makefile -# @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)