Skip to content

Commit

Permalink
Revert "Merge pull request #3382 from andralex/tee"
Browse files Browse the repository at this point in the history
This reverts commit 2ed7d90, reversing
changes made to 54dece1.
  • Loading branch information
MartinNowak committed Jul 23, 2015
1 parent aebeac9 commit f87d23a
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions posix.mak
Expand Up @@ -423,12 +423,14 @@ endif
###########################################################
# html documentation

# Package to html, e.g. std/algorithm -> std_algorithm.html
P2HTML=$(addsuffix .html,$(subst /,_,$1))
# D file to html, e.g. std/conv.d -> std_conv.html
# However, std/algorithm/package.d -> std_algorithm.html
D2HTML=$(subst /,_,$(subst .d,.html,$(subst /package.d,.d,$1)))
D2HTML=$(subst /,_,$(subst .d,.html,$1))

HTMLS=$(addprefix $(DOC_OUTPUT_DIR)/, \
$(call D2HTML, $(SRC_DOCUMENTABLES)))
$(call D2HTML, $(SRC_DOCUMENTABLES)) \
$(call P2HTML, $(STD_PACKAGES)))
BIGHTMLS=$(addprefix $(BIGDOC_OUTPUT_DIR)/, \
$(call D2HTML, $(SRC_DOCUMENTABLES)))

Expand All @@ -441,6 +443,12 @@ $(foreach p,$(SRC_DOCUMENTABLES),$(eval \
$(DOC_OUTPUT_DIR)/$(call D2HTML,$p) : $p $(STDDOC) ;\
$(DDOC) project.ddoc $(STDDOC) -Df$$@ $$<))

# For each package, define a rule e.g.:
# ../web/phobos/std_algorithm.html : std/algorithm/package.d $(STDDOC) ; ...
$(foreach p,$(STD_PACKAGES),$(eval \
$(DOC_OUTPUT_DIR)/$(call P2HTML,$p) : $(STDDOC) ;\
$(DDOC) project.ddoc $(STDDOC) -Df$$@ $$<))

html : $(DOC_OUTPUT_DIR)/. $(HTMLS) $(STYLECSS_TGT)

allmod :
Expand Down

0 comments on commit f87d23a

Please sign in to comment.