Committer: Miika Komu <miika@xxxxxx> Date: 31/03/2010 at 07:53:47 Revision: 4116 Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: Minimized doc directory. Removed depracated latex files, pictures and text files. The build rules for the manual needs to be moved to Makefile.am. Modified: D doc/README D doc/acronyms.tex D doc/agent-gui-doc.odt D doc/catalogue.tex D doc/crypto.txt D doc/daemon-agent-gui.odg D doc/design_choices.bib D doc/design_choices.tex D doc/design_choices_macros.tex D doc/fig/ D doc/fig/absproto.fig D doc/fig/base_exchange.fig D doc/fig/bind_diagram.fig D doc/fig/collaboration.fig D doc/fig/connect_diagram.fig D doc/fig/hooks.fig D doc/fig/input.fig D doc/fig/kernel_model.fig D doc/fig/mm-update.fig D doc/fig/output.fig D doc/fig/rea.fig D doc/fig/recv_diagram.fig D doc/fig/send_diagram.fig D doc/fig/stack_model.fig D doc/hip-state/ D doc/hip-state/hip-state-e0.dia D doc/hip-state/hip-state-e1.dia D doc/hip-state/hip-state-e2.dia D doc/hip-state/hip-state-e3.dia D doc/hip-state/hip-state-e4a.dia D doc/hip-state/hip-state-e4b.dia D doc/hipl.tex D doc/src-chgs-filelist D doc/testing.txt D doc/userspace.txt M doc/Makefile M release.version === modified file 'doc/Makefile' --- doc/Makefile 2010-03-03 13:16:18 +0000 +++ doc/Makefile 2010-03-31 04:55:19 +0000 @@ -1,27 +1,12 @@ ############################################################################### # # TODO: -# - xx +# - move this to Makefile.am # ### VARIABLE DECLARATIONS #################################################### -LATEX = latex -DVIPS = dvips -FIG2DEV = fig2dev -BIBTEX = bibtex -DVIPDF = dvipdf -PDFLATEX = pdflatex XMLTO = xmlto -PERL = perl - -FIGS = fig/collaboration.fig fig/hooks.fig fig/kernel_model.fig \ - fig/input.fig fig/output.fig fig/base_exchange.fig \ - fig/stack_model.fig fig/mm-update.fig fig/bind_diagram.fig \ - fig/connect_diagram.fig fig/send_diagram.fig fig/recv_diagram.fig - -BIBS = design_choices.bib -DESIGN_CHOICES_SOURCES = catalogue.tex design_choices_macros.tex hipl.tex -DESIGN_CHOICES = design_choices + HOWTO = HOWTO HOWTO_HTML_DIR = howto-html @@ -30,56 +15,23 @@ ### COMPILATION RULESETS ###################################################### -%.dvi: %.tex - $(LATEX) $* - $(BIBTEX) $(BIBS:.bib=) - $(LATEX) $* - $(LATEX) $* - -%.pdf: %.tex - $(PDFLATEX) $* - $(BIBTEX) $(BIBS:.bib=) - $(PDFLATEX) $* - $(PDFLATEX) $* - -%.eps: %.fig - $(FIG2DEV) -Leps $< $@ - -%.pdf: %.fig - $(FIG2DEV) -L pdf $*.fig $*.pdf - -%.ps: %.dvi - $(DVIPS) -o $*.ps $*.dvi - %.txt: %.xml $(XMLTO) txt $< %.html: %.xml $(XMLTO) -o $(HOWTO_HTML_DIR) html $< - #sed -i s/charset=ISO-8859-1/charset=UTF-8/ $(HOWTO_HTML_DIR)/*.html cp docshot-*.png $(HOWTO_HTML_DIR) cp base-exchange-*.png $(HOWTO_HTML_DIR) ### TARGETS ################################################################## all: $(HOWTO).txt $(HOWTO).html \ -# $(DESIGN_CHOICES).dvi $(DESIGN_CHOICES).ps $(DESIGN_CHOICES).pdf - -$(DESIGN_CHOICES).dvi: $(DESIGN_CHOICES).tex $(DESIGN_CHOICES_SOURCES) \ - $(FIGS:.fig=.eps) - -$(DESIGN_CHOICES).pdf: $(DESIGN_CHOICES).tex $(DESIGN_CHOICES_SOURCES) \ - $(FIGS:.fig=.pdf) - -$(DESIGN_CHOICES).ps: $(DESIGN_CHOICES).dvi $(HOWTO).txt: $(HOWTO).xml $(HOWTO).html: $(HOWTO).xml clean: - rm -f *~ *.aux *.log *.toc *.bbl *.blg *.ps *.dvi *.pdf *.out rm -f HOWTO.txt - rm -f $(patsubst %.fig, %.eps, $(FIGS)) rm -rf $(HOWTO_HTML_DIR) install: all @@ -89,6 +41,5 @@ mkdir -p $(DOCDIR) cp $(HOWTO).txt $(DOCDIR) cp -a $(HOWTO_HTML_DIR) $(DOCDIR) - #cp $(DESIGN_CHOICES).ps $(DESIGN_CHOICES).pdf $(DESIGN_CHOICES).dvi $(DOCDIR) .phony: clean === removed directory 'doc/fig' === removed directory 'doc/hip-state' === modified file 'release.version' --- release.version 2010-03-19 11:45:53 +0000 +++ release.version 2010-03-31 04:55:19 +0000 @@ -1,2 +1,2 @@ Version: 1.0.6 -Release: 6 +Release: 7