From 50cc81772cbdd3d2bbd09884e1fb0d9965ae399b Mon Sep 17 00:00:00 2001 From: Alejandro Gallo Date: Thu, 10 Mar 2022 15:00:08 +0100 Subject: [PATCH] Put doxygen in sphinx --- .github/workflows/main.yml | 7 +------ docs/Doxyfile | 2 +- docs/Makefile | 9 +++++++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 940d122..970fb9c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -67,13 +67,8 @@ jobs: cd docs nix-shell --run 'make sphinx' - - name: Make sphinx as the main page - run: | - cd docs - mv sphinx/* . - - name: Deploy uses: JamesIves/github-pages-deploy-action@4.1.0 with: branch: gh-pages - folder: ./docs + folder: ./docs/build diff --git a/docs/Doxyfile b/docs/Doxyfile index 3bcf171..cad31d8 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -58,7 +58,7 @@ PROJECT_LOGO = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = doxygen +OUTPUT_DIRECTORY = build/doxygen # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and diff --git a/docs/Makefile b/docs/Makefile index f50e852..bb465ba 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,14 +1,19 @@ -DOXYGEN_INDEX = doxygen/html/index.html +# variables +# +SPHINX_BUILD_DIR = build +DOXYGEN_INDEX = $(SPHINX_BUILD_DIR)/doxygen/html/index.html +# rules +# all: doxygen sphinx .PHONY: sphinx doxygen doxygen: $(DOXYGEN_INDEX) $(DOXYGEN_INDEX): + mkdir -p $(@D) doxygen Doxyfile -SPHINX_BUILD_DIR = sphinx $(SPHINX_BUILD_DIR)/index.html: index.rst atrip.rst conf.py sphinx-build . $(SPHINX_BUILD_DIR) sphinx: $(SPHINX_BUILD_DIR)/index.html