From ee0acb5ccef3cc78f17e9584f232e4d09d8b575b Mon Sep 17 00:00:00 2001
From: Kevin Broch <kbroch@rivosinc.com>
Date: Tue, 23 Jan 2024 20:45:21 -0800
Subject: [PATCH] refactor makefile: add var to inject asciidoctor options;
 change to build dir instead of outfile

Signed-off-by: Kevin Broch <kbroch@rivosinc.com>
---
 Makefile                              | 16 ++++++++--------
 docs-resources                        |  2 +-
 src/{header.adoc => spec-sample.adoc} |  0
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{header.adoc => spec-sample.adoc} (100%)

diff --git a/Makefile b/Makefile
index 3df8b68..d7d0d41 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,8 @@ riscvintl/riscv-docs-base-container-image:latest
 
 SRC_DIR := src
 BUILD_DIR := build
-HEADER_SOURCE := $(SRC_DIR)/header.adoc
-PDF_RESULT := $(BUILD_DIR)/spec-sample.pdf
-HTML_RESULT := $(BUILD_DIR)/spec-sample.html
-
+HEADER_SOURCE := $(SRC_DIR)/spec-sample.adoc
+XTRA_ADOC_OPTS :=
 ASCIIDOCTOR_PDF := asciidoctor-pdf
 ASCIIDOCTOR_HTML := asciidoctor
 OPTIONS := --trace \
@@ -34,6 +32,8 @@ OPTIONS := --trace \
            -a revdate=${DATE} \
            -a pdf-fontsdir=docs-resources/fonts \
            -a pdf-theme=docs-resources/themes/riscv-pdf.yml \
+           $(XTRA_ADOC_OPTS) \
+		   -D build \
            --failure-level=ERROR
 REQUIRES := --require=asciidoctor-bibtex \
             --require=asciidoctor-diagram \
@@ -55,14 +55,14 @@ build:
 
 build-container:
 	@echo "Starting build inside Docker container..."
-	$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) --out-file=$(PDF_RESULT) $(HEADER_SOURCE)"
-	$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) --out-file=$(HTML_RESULT) $(HEADER_SOURCE)"
+	$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)"
+	$(DOCKER_RUN) /bin/sh -c "$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)"
 	@echo "Build completed successfully inside Docker container."
 
 build-no-container:
 	@echo "Starting build..."
-	$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) --out-file=$(PDF_RESULT) $(HEADER_SOURCE)
-	$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) --out-file=$(HTML_RESULT) $(HEADER_SOURCE)
+	$(ASCIIDOCTOR_PDF) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)
+	$(ASCIIDOCTOR_HTML) $(OPTIONS) $(REQUIRES) $(HEADER_SOURCE)
 	@echo "Build completed successfully."
 
 clean:
diff --git a/docs-resources b/docs-resources
index 8abc934..66f972d 160000
--- a/docs-resources
+++ b/docs-resources
@@ -1 +1 @@
-Subproject commit 8abc93401a61e52c460888ff658518a56e37ee9c
+Subproject commit 66f972d7dc961551a7815d2fceb82fbea7ce2c44
diff --git a/src/header.adoc b/src/spec-sample.adoc
similarity index 100%
rename from src/header.adoc
rename to src/spec-sample.adoc