Skip to content

Commit

Permalink
chore(tooling): Tweak makefile construction to avoid duplicate target…
Browse files Browse the repository at this point in the history
… warning
  • Loading branch information
alerque committed Dec 5, 2024
1 parent c9756a2 commit 9b3f5de
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
11 changes: 8 additions & 3 deletions Makefile-fonts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
.PHONY: fonttooling

if FONT_DOWNLOAD_TOOLS

# Target defined in Makefile.am, just adding a dependency here
.sources: fonttooling
[ -h .sources ] || mkdir -p $@

.fonts: fonttooling
[ -h .fonts ] || mkdir -p $@

if FONT_DOWNLOAD_TOOLS

# Also defined as a dummy on other side of conditional
fonttooling:
$(if $(BSDTAR),,$(error Please set BSDTAR with path or `./configure --enable-developer-mode`))
$(if $(CURL),,$(error Please set CURL with path or `./configure --enable-developer-mode`))
Expand Down Expand Up @@ -154,4 +155,8 @@ notobase = $(shell echo $(notdir $1) | sed -e 's/-.*//')
$(BSDTAR) -x -f $< -C $(dir $@) $(notdir $@) && \
touch $@

else !FONT_DOWNLOAD_TOOLS

fonttooling: ;

endif
3 changes: 0 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,6 @@ patterndeps = $(_FORCED) $(_TEST_DEPS) $(_DOCS_DEPS) | $(bin_PROGRAMS) $(EXTRA_R
XML_ENTITIES = .sources/unicode.xml
XML_ENTITIES_COMMIT = 77acf14428202e4e1dba54ff1e5ed43fe5ab474f

.sources:
[ -h .sources ] || mkdir -p $@

$(XML_ENTITIES):
$(CURL) https://raw.githubusercontent.com/w3c/xml-entities/$(XML_ENTITIES_COMMIT)/unicode.xml -o $@

Expand Down

0 comments on commit 9b3f5de

Please sign in to comment.