Changeset 3040843 in sasmodels for doc/Makefile

Timestamp:

Mar 3, 2015 11:26:25 AM (10 years ago)

Author:

Doucet, Mathieu <doucetm@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

6272968

Parents:

5befedd (diff), 61ba623 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

File:

• doc/Makefile (modified) (3 diffs)

doc/Makefile

@@ -32 +32 @@
 MODELS_RST = $(patsubst ../sasmodels/models/%.py,model/%.rst,$(MODELS_PY))
 
-model/img/%: ../sasmodels/models/img/%
-        $(COPY) $< $@
-
-model/%.rst: ../sasmodels/models/%.py
-        $(PYTHON) genmodel.py $< $@
-
-.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest build
-
 help:
         @echo "Please use \`make <target>' where <target> is one of"
@@ -53 +45 @@
         @echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
 
+model/img/%: ../sasmodels/models/img/%
+        $(COPY) $< $@
+
+model/%.rst: ../sasmodels/models/%.py
+        $(PYTHON) genmodel.py $< $@
+
+ref/models/index.rst: gentoc.py $(MODELS_PY)
+        $(PYTHON) gentoc.py $(MODELS_PY)
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest build
+
 api: genapi.py
         $(RMDIR) api
@@ -61 +64 @@
         $(MKDIR) model/img
 
-build: model $(MODELS_RST) $(IMG_DEST) api
+build: model $(MODELS_RST) $(IMG_DEST) api ref/models/index.rst
         #cd ../.. && python setup.py build