commit: 86cdbfd7efdb5bc5c089891ccb50533e58b62529
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 16:39:11 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 16:39:11 2024 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=86cdbfd7
Makefile: Remove the separate "build" target
This had been added in commit aa6e1e365fff48b6e1e5470791f499a0589d39c3,
so that app-doc/devmanual[offline] could call "emake build" without
building documents.js. This is no longer needed; the offline condition
can be tested by the Makefile itself.
Drop validate as prerequisite of all because it required libxml2 as
additional build dependency.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Makefile | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index c4bb713..042ffa7 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,13 @@ DESTDIR =
# Nonzero value disables external assets for offline browsing.
OFFLINE = 0
-all: prereq validate build documents.js
+ifeq ($(OFFLINE),0)
+ JS_BUILD = documents.js
+else
+ JS_BUILD =
+endif
+
+all: prereq $(HTMLS) $(IMAGES) $(JS_BUILD)
prereq:
@type rsvg-convert >/dev/null 2>&1 || \
@@ -27,15 +33,10 @@ prereq:
@type xsltproc >/dev/null 2>&1 || \
{ echo "dev-libs/libxslt is with python required" >&2;\
exit 1; }
- @type xmllint >/dev/null 2>&1 || \
- { echo "dev-libs/libxml2 is required" >&2;\
- exit 1; }
@fc-list -q "Open Sans" || \
{ echo "media-fonts/open-sans is required" >&2;\
exit 1; }
-build: $(HTMLS) $(IMAGES)
-
# We need to parse all the XMLs every time, not just the ones
# that are newer than the target. This is because each search
# document in devmanual gets a unique ID, which is used to
@@ -78,7 +79,7 @@ appendices/todo-list/index.html: $(XMLS)
.depend: $(XMLS) eclass-reference/text.xml depend.xsl devbook.xsl
@xsltproc depend.xsl $(XMLS) > $@
-install: build documents.js
+install: all
set -e; \
for file in $(HTMLS) $(ECLASS_HTMLS) $(IMAGES); do \
install -d "$(DESTDIR)$(htmldir)"/$${file%/*}; \
@@ -133,6 +134,6 @@ distclean: clean
@rm -f .depend
@rm -rf eclass-reference
-.PHONY: all prereq build install check validate tidy dist clean distclean
+.PHONY: all prereq install check validate tidy dist clean distclean
-include .depend
