Updating branch refs/heads/master
to 61b11867f99aba17fa6d72fa2d73145f75ee3f44 (commit)
from 535d8325ea6ca4ba97e7b8f6b961343ba3ec8aa2 (commit)
commit 61b11867f99aba17fa6d72fa2d73145f75ee3f44
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Tue Sep 22 03:56:11 2009 +0200
Add Makefile.am for all directories. Remove rules we don't need.
Makefile.am | 4 ++
docs/Makefile.am | 4 ++
docs/project-template/C/Makefile.am | 28 ++++++++++
docs/project-template/{ => C}/conf.py | 0
docs/project-template/{ => C}/index.rst | 0
docs/project-template/Makefile.am | 89 +-----------------------------
6 files changed, 39 insertions(+), 86 deletions(-)
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..9aa2e1d
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,4 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+
+SUBDIRS = \
+ docs
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 0000000..db6688e
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,4 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+
+SUBDIRS = \
+ project-template
diff --git a/docs/project-template/C/Makefile.am
b/docs/project-template/C/Makefile.am
new file mode 100644
index 0000000..b12759f
--- /dev/null
+++ b/docs/project-template/C/Makefile.am
@@ -0,0 +1,28 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+PAPER =
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes
linkcheck doctest
+
+clean:
+ -rm -rf _build/*
+
+all:
+ $(SPHINX_BUILD) -b html $(ALLSPHINXOPTS) _build/html
+ @echo
+ @echo "Build finished. The HTML pages are in _build/html."
+
+# TODO add install rule
+
+changes:
+ $(SPHINX_BUILD) -b changes $(ALLSPHINXOPTS) _build/changes
+ @echo
+ @echo "The overview file is in _build/changes."
diff --git a/docs/project-template/conf.py b/docs/project-template/C/conf.py
similarity index 100%
rename from docs/project-template/conf.py
rename to docs/project-template/C/conf.py
diff --git a/docs/project-template/index.rst b/docs/project-template/C/index.rst
similarity index 100%
rename from docs/project-template/index.rst
rename to docs/project-template/C/index.rst
diff --git a/docs/project-template/Makefile.am
b/docs/project-template/Makefile.am
index 344a7e0..6570e41 100644
--- a/docs/project-template/Makefile.am
+++ b/docs/project-template/Makefile.am
@@ -1,87 +1,4 @@
-# Makefile for Sphinx documentation
-#
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
-# You can set these variables from the command line.
-SPHINXOPTS =
-PAPER =
-
-# Internal variables.
-PAPEROPT_a4 = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes
linkcheck doctest
-
-help:
- @echo "Please use \`make <target>' where <target> is one of"
- @echo " html to make standalone HTML files"
- @echo " dirhtml to make HTML files named index.html in directories"
- @echo " pickle to make pickle files"
- @echo " json to make JSON files"
- @echo " htmlhelp to make HTML files and a HTML help project"
- @echo " qthelp to make HTML files and a qthelp project"
- @echo " latex to make LaTeX files, you can set PAPER=a4 or
PAPER=letter"
- @echo " changes to make an overview of all changed/added/deprecated
items"
- @echo " linkcheck to check all external links for integrity"
- @echo " doctest to run all doctests embedded in the documentation
(if enabled)"
-
-clean:
- -rm -rf _build/*
-
-html:
- $(SPHINX_BUILD) -b html $(ALLSPHINXOPTS) _build/html
- @echo
- @echo "Build finished. The HTML pages are in _build/html."
-
-dirhtml:
- $(SPHINX_BUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
- @echo
- @echo "Build finished. The HTML pages are in _build/dirhtml."
-
-pickle:
- $(SPHINX_BUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
- @echo
- @echo "Build finished; now you can process the pickle files."
-
-json:
- $(SPHINX_BUILD) -b json $(ALLSPHINXOPTS) _build/json
- @echo
- @echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
- $(SPHINX_BUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp
- @echo
- @echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in _build/htmlhelp."
-
-qthelp:
- $(SPHINX_BUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp
- @echo
- @echo "Build finished; now you can run "qcollectiongenerator" with the"
\
- ".qhcp project file in _build/qthelp, like this:"
- @echo "# qcollectiongenerator _build/qthelp/Example Project.qhcp"
- @echo "To view the help file:"
- @echo "# assistant -collectionFile _build/qthelp/Example Project.qhc"
-
-latex:
- $(SPHINX_BUILD) -b latex $(ALLSPHINXOPTS) _build/latex
- @echo
- @echo "Build finished; the LaTeX files are in _build/latex."
- @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
- "run these through (pdf)latex."
-
-changes:
- $(SPHINX_BUILD) -b changes $(ALLSPHINXOPTS) _build/changes
- @echo
- @echo "The overview file is in _build/changes."
-
-linkcheck:
- $(SPHINX_BUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
- @echo
- @echo "Link check complete; look for any errors in the above output " \
- "or in _build/linkcheck/output.txt."
-
-doctest:
- $(SPHINX_BUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest
- @echo "Testing of doctests in the sources finished, look at the " \
- "results in _build/doctest/output.txt."
+SUBDIRS = \
+ C
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
