a9cd39cc0cd34eeaf3f256a9b53138e6ef8e884e

Manual generation is now included in the doc/Makefile. Additionally,
a doc target has been added to the global Makefile.

diff --git a/Makefile b/Makefile
index 65085afd50fe5b8b2f68f368289a6c4d6723ed1f..0b35fdf957e174b8ee34ac06adf0538171eb1d6a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-
+.PHONY: doc
 
 all:   build-simavr build-tests build-examples
 
@@ -14,8 +14,12 @@ build-examples: build-simavr
 install:
        $(MAKE) -C simavr install
 
+doc:
+       $(MAKE) -C doc
+
 clean:
        $(MAKE) -C simavr clean
        $(MAKE) -C tests clean
        $(MAKE) -C examples clean
+       $(MAKE) -C doc clean
 

diff --git a/doc/Makefile b/doc/Makefile
index b3a7a0ff87b1a0f3a6e85007114ab23582596528..18934e5e03e8b744608e116ed9355ee30b29f8df 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -16,10 +16,13 @@
 #      You should have received a copy of the GNU General Public License
 #      along with simavr.  If not, see <http://www.gnu.org/licenses/>.
 
-# you need Graphviz, ruby and exuberant ctags here. 
-# this is not generated in the normal code build
+# For the callgraph, you need Graphviz, ruby and exuberant ctags.
+# The manual requires latex including additional packages (acronym, graphicx, fancyvrb, ...).
+# This is not generated in the normal code build
 
-all:   simavr_callgraph.pdf
+.PHONY: manual
+
+all:   simavr_callgraph.pdf manual
 
 simavr_callgraph.pdf:
        ctags -f .tags ../simavr/sim/sim_*.[ch] ../simavr/sim/run_*.[ch] 2>/dev/null && \
@@ -27,5 +30,9 @@ simavr_callgraph.pdf:
                        ../simavr/sim/sim_*.c ../simavr/sim/run_*.c >.tags.dot && \
                                dot -Tpdf .tags.dot -o $@
 
+manual:
+       $(MAKE) -C manual
+
 clean:
        rm -f .tags*
+       $(MAKE) -C manual clean