Skip to content
This repository has been archived by the owner on Feb 15, 2021. It is now read-only.

Commit

Permalink
Reordering to get prerequisites right
Browse files Browse the repository at this point in the history
  • Loading branch information
martinthomson committed Dec 21, 2015
1 parent fcceec0 commit 45034cd
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions Makefile
Expand Up @@ -25,11 +25,6 @@ ifeq (true,$(LINEWRAP))
(echo $(INPUT)" has lines not wrapped at "$(LINEWRAPLENGTH)" characters" && false)
endif

$(OUTPUT): $(INPUT) $(SUPPORTDIR)/respec $(BUILD_FILES)
phantomjs --ignore-ssl-errors=true --ssl-protocol=tlsv1 $(SUPPORTDIR)/respec/tools/respec2html.js -e -w $< $@

$(warning BUILD_FILES = $(BUILD_FILES))

.PHONY: webidl
webidl: $(OUTPUT) $(SUPPORTDIR)/webidl-checker $(WIDLPROC_PATH)
WIDLPROC_PATH=$(WIDLPROC_PATH) python $(SUPPORTDIR)/webidl-checker/webidl-check $< > /dev/null
Expand Down Expand Up @@ -77,14 +72,18 @@ update:: force_update $(foreach repo,$(REPOS),$(call to_dir,$(repo))) $(tidy) $(
force_update::
@touch $(SUPPORTDIR)/repos.mk

## Copy auxiliary files listed in W3CTRMANIFEST
## Build a processed copy of the spec

BUILD_INPUT = $(shell tail -n +2 W3CTRMANIFEST)
BUILD_FILES = $(addprefix $(BUILDDIR)/,$(BUILD_INPUT))
include $(SUPPORTDIR)/build.mk
$(SUPPORTDIR)/build.mk: W3CTRMANIFEST $(SUPPORTDIR)
@echo ' $(foreach f,$(BUILD_INPUT),$(BUILDDIR)/$(f): $(f) $(BUILDDIR)\n\tcp -f $$< $$@\n)' > $@

$(OUTPUT): $(INPUT) $(SUPPORTDIR)/respec $(BUILD_FILES)
phantomjs --ignore-ssl-errors=true --ssl-protocol=tlsv1 $(SUPPORTDIR)/respec/tools/respec2html.js -e -w $< $@


## Machine setup

.PHONY: travissetup
Expand Down

0 comments on commit 45034cd

Please sign in to comment.