diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2013-09-01 21:53:03 +0200 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2013-09-16 07:26:49 -0400 |
| commit | 136900fdbbe218d16190c38042ec2aa16cb50840 (patch) | |
| tree | ed65a8ca63873d95ac6bcc3f30e058b796f670bf | |
| parent | 268f3f0ff5d80544ca21d565354eae6d3e29fb91 (diff) | |
| download | rust-136900fdbbe218d16190c38042ec2aa16cb50840.tar.gz rust-136900fdbbe218d16190c38042ec2aa16cb50840.zip | |
Finish addition of rustdoc_ng to Makefiles.
| -rw-r--r-- | mk/tools.mk | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/mk/tools.mk b/mk/tools.mk index b5e413804ec..848fa8447b6 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -25,8 +25,8 @@ RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs) # rustdoc_ng, the next generation documentation tool -RUSTDOCNG_LIB := $(S)src/rustdoc/lib.rs -RUSTDOCNG_INPUTS := $(wildcard $(S)src/rustdoc/*.rs) +RUSTDOCNG_LIB := $(S)src/rustdoc_ng/lib.rs +RUSTDOCNG_INPUTS := $(wildcard $(S)src/rustdoc_ng/*.rs) # Rusti, the JIT REPL RUSTI_LIB := $(S)src/librusti/rusti.rs @@ -83,6 +83,16 @@ $$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X_$(4)): \ @$$(call E, compile_and_link: $$@) $$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustdoc -o $$@ $$< +$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOCNG_$(4)): \ + $$(RUSTDOCNG_LIB) $$(RUSTDOCNG_INPUTS) \ + $$(SREQ$(1)_T_$(4)_H_$(3)) \ + $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \ + | $$(TLIB$(1)_T_$(4)_H_$(3))/ + @$$(call E, compile_and_link: $$@) + $$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOCNG_GLOB_$(4)),$$(notdir $$@)) + $$(STAGE$(1)_T_$(4)_H_$(3)) --out-dir $$(@D) $$< && touch $$@ + $$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOCNG_GLOB_$(4)),$$(notdir $$@)) + $$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc_ng$$(X_$(4)): \ $$(DRIVER_CRATE) \ $$(TSREQ$(1)_T_$(4)_H_$(3)) \ @@ -115,6 +125,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUST_$(4)): \ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)) \ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)) \ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOC_$(4)) \ + $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOCNG_$(4)) \ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4)) \ | $$(TLIB$(1)_T_$(4)_H_$(3))/ @$$(call E, compile_and_link: $$@) @@ -184,6 +195,19 @@ $$(HBIN$(2)_H_$(4))/rustdoc$$(X_$(4)): \ @$$(call E, cp: $$@) $$(Q)cp $$< $$@ +$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTDOCNG_$(4)): \ + $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTDOCNG_$(4)) \ + $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \ + $$(HSREQ$(2)_H_$(4)) \ + | $$(HLIB$(2)_H_$(4))/ + @$$(call E, cp: $$@) + $$(call REMOVE_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOCNG_GLOB_$(4)),$$(notdir $$@)) + $$(Q)cp $$< $$@ + $$(call LIST_ALL_OLD_GLOB_MATCHES_EXCEPT,$$(dir $$@),$(LIBRUSTDOCNG_GLOB_$(4)),$$(notdir $$@)) + $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOCNG_GLOB_$(4)) \ + $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTDOCNG_DSYM_GLOB_$(4))) \ + $$(HLIB$(2)_H_$(4)) + $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTI_$(4)): \ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTI_$(4)) \ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \ |