Make doc a real subdirectory so we can put other things there.

This commit is contained in:
Bob Lantz
2012-10-29 15:36:19 -07:00
parent 600dad2498
commit 31015ef5d8
2 changed files with 12 additions and 8 deletions
+10 -6
View File
@@ -9,11 +9,13 @@ MANPAGES = mn.1 mnexec.1
P8IGN = E251,E201,E302,E202
BINDIR = /usr/bin
MANDIR = /usr/share/man/man1
DOCDIRS = doc/html doc/latex
PDF = doc/latex/refman.pdf
all: codecheck test
clean:
rm -rf build dist *.egg-info *.pyc $(MNEXEC) $(MANPAGES)
rm -rf build dist *.egg-info *.pyc $(MNEXEC) $(MANPAGES) $(DOCDIRS)
codecheck: $(PYSRC)
-echo "Running code check"
@@ -31,6 +33,9 @@ test: $(MININET) $(TEST)
-echo "Running tests"
mininet/test/test_nets.py
mnexec: mnexec.c $(MN) mininet/net.py
cc $(CFLAGS) $(LDFLAGS) -DVERSION=\"`PYTHONPATH=. $(MN) --version`\" $< -o $@
install: $(MNEXEC) $(MANPAGES)
install $(MNEXEC) $(BINDIR)
install $(MANPAGES) $(MANDIR)
@@ -48,13 +53,12 @@ mn.1: $(MN)
PYTHONPATH=. help2man -N -n "create a Mininet network." \
--no-discard-stderr $< -o $@
mnexec: mnexec.c $(MN) mininet/net.py
cc $(CFLAGS) $(LDFLAGS) -DVERSION=\"`PYTHONPATH=. $(MN) --version`\" $< -o $@
mnexec.1: mnexec
help2man -N -n "execution utility for Mininet." \
-h "-h" -v "-v" --no-discard-stderr ./$< -o $@
doc: man
doxygen doxygen.cfg
.PHONY: doc
doc: man
doxygen doc/doxygen.cfg
make -C doc/latex