Move design-paper into its own directory, and ship it and all that is needed... (0430b4c5) · Commits · Legacy / gitolite / user / isis / Tor

autogen.sh

+2 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,5 @@
		aclocal &&
		autoheader &&
		autoconf &&
		automake --add-missing --copy
		automake --add-missing --copy &&
		./configure

configure.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,5 +220,5 @@ AC_SUBST(LOCALSTATEDIR)

		echo "confdir: $CONFDIR"

		AC_OUTPUT(Makefile contrib/tor.sh contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile)
		AC_OUTPUT(Makefile contrib/tor.sh contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile)

doc/Makefile.am

+5 −2

Original line number	Diff line number	Diff line

		EXTRA_DIST = tor-spec.txt CLIENTS FAQ HACKING rend-spec.txt tor-design.tex tor-doc.html tor-doc.css
		EXTRA_DIST = tor-spec.txt CLIENTS FAQ HACKING rend-spec.txt tor-doc.html tor-doc.css

		man_MANS = tor.1

		SUBDIRS = design-paper

		DIST_SUBDIRS = design-paper

doc/design-paper/Makefile.am

0 → 100644

+26 −0

Original line number	Diff line number	Diff line

		cell-struct.eps: cell-struct.fig
		fig2dev -L eps $< $@
		interaction.eps: interaction.fig
		fig2dev -L eps $< $@
		cell-struct.pdf: cell-struct.fig
		fig2dev -L pdf $< $@
		interaction.pdf: interaction.fig
		fig2dev -L pdf $< $@

		tor-design.ps: cell-struct.eps interaction.eps tor-design.bib tor-design.tex usenix.sty latex8.bst
		latex tor-design.tex
		bibtex tor-design
		latex tor-design.tex
		latex tor-design.tex
		dvips -o $@ tor-design.dvi

		tor-design.pdf: cell-struct.pdf interaction.pdf tor-design.bib tor-design.tex usenix.sty latex8.bst
		pdflatex tor-design.tex
		bibtex tor-design
		pdflatex tor-design.tex
		pdflatex tor-design.tex

		EXTRA_DIST = cell-struct.fig interaction.fig tor-design.bib usenix.sty latex8.bst tor-design.tex

		DISTCLEANFILES = cell-struct.eps interaction.eps cell-struct.pdf interaction.pdf tor-design.aux tor-design.bbl tor-design.blg tor-design.log tor-design.dvi tor-design.ps

doc/design-paper/Makefile.in

0 → 100644

+206 −0

Original line number	Diff line number	Diff line
		# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am

		# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
		# This Makefile.in is free software; the Free Software Foundation
		# gives unlimited permission to copy and/or distribute it,
		# with or without modifications, as long as this notice is preserved.

		# This program is distributed in the hope that it will be useful,
		# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
		# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
		# PARTICULAR PURPOSE.


		SHELL = @SHELL@

		srcdir = @srcdir@
		top_srcdir = @top_srcdir@
		VPATH = @srcdir@
		prefix = @prefix@
		exec_prefix = @exec_prefix@

		bindir = @bindir@
		sbindir = @sbindir@
		libexecdir = @libexecdir@
		datadir = @datadir@
		sysconfdir = @sysconfdir@
		sharedstatedir = @sharedstatedir@
		localstatedir = @localstatedir@
		libdir = @libdir@
		infodir = @infodir@
		mandir = @mandir@
		includedir = @includedir@
		oldincludedir = /usr/include

		DESTDIR =

		pkgdatadir = $(datadir)/@PACKAGE@
		pkglibdir = $(libdir)/@PACKAGE@
		pkgincludedir = $(includedir)/@PACKAGE@

		top_builddir = ../..

		ACLOCAL = @ACLOCAL@
		AUTOCONF = @AUTOCONF@
		AUTOMAKE = @AUTOMAKE@
		AUTOHEADER = @AUTOHEADER@

		INSTALL = @INSTALL@
		INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
		INSTALL_DATA = @INSTALL_DATA@
		INSTALL_SCRIPT = @INSTALL_SCRIPT@
		transform = @program_transform_name@

		NORMAL_INSTALL = :
		PRE_INSTALL = :
		POST_INSTALL = :
		NORMAL_UNINSTALL = :
		PRE_UNINSTALL = :
		POST_UNINSTALL = :
		host_alias = @host_alias@
		host_triplet = @host@
		BINDIR = @BINDIR@
		CC = @CC@
		CONFDIR = @CONFDIR@
		HAVE_LIB = @HAVE_LIB@
		LIB = @LIB@
		LOCALSTATEDIR = @LOCALSTATEDIR@
		LTLIB = @LTLIB@
		MAKEINFO = @MAKEINFO@
		PACKAGE = @PACKAGE@
		RANLIB = @RANLIB@
		VERSION = @VERSION@

		EXTRA_DIST = cell-struct.fig interaction.fig tor-design.bib usenix.sty latex8.bst tor-design.tex

		DISTCLEANFILES = cell-struct.eps interaction.eps cell-struct.pdf interaction.pdf tor-design.aux tor-design.bbl tor-design.blg tor-design.log tor-design.dvi tor-design.ps
		mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
		CONFIG_HEADER = ../../orconfig.h
		CONFIG_CLEAN_FILES =
		DIST_COMMON = Makefile.am Makefile.in


		DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

		TAR = tar
		GZIP_ENV = --best
		all: all-redirect
		.SUFFIXES:
		$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
		cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/design-paper/Makefile

		Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
		cd $(top_builddir) \
		&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

		tags: TAGS
		TAGS:


		distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

		subdir = doc/design-paper

		distdir: $(DISTFILES)
		here=`cd $(top_builddir) && pwd`; \
		top_distdir=`cd $(top_distdir) && pwd`; \
		distdir=`cd $(distdir) && pwd`; \
		cd $(top_srcdir) \
		&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/design-paper/Makefile
		@for file in $(DISTFILES); do \
		d=$(srcdir); \
		if test -d $$d/$$file; then \
		cp -pr $$d/$$file $(distdir)/$$file; \
		else \
		test -f $(distdir)/$$file \
		\|\| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
		\|\| cp -p $$d/$$file $(distdir)/$$file \|\| :; \
		fi; \
		done
		info-am:
		info: info-am
		dvi-am:
		dvi: dvi-am
		check-am: all-am
		check: check-am
		installcheck-am:
		installcheck: installcheck-am
		install-exec-am:
		install-exec: install-exec-am

		install-data-am:
		install-data: install-data-am

		install-am: all-am
		@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
		install: install-am
		uninstall-am:
		uninstall: uninstall-am
		all-am: Makefile
		all-redirect: all-am
		install-strip:
		$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
		installdirs:


		mostlyclean-generic:

		clean-generic:

		distclean-generic:
		-rm -f Makefile $(CONFIG_CLEAN_FILES)
		-rm -f config.cache config.log stamp-h stamp-h[0-9]*
		-test -z "$(DISTCLEANFILES)" \|\| rm -f $(DISTCLEANFILES)

		maintainer-clean-generic:
		mostlyclean-am: mostlyclean-generic

		mostlyclean: mostlyclean-am

		clean-am: clean-generic mostlyclean-am

		clean: clean-am

		distclean-am: distclean-generic clean-am

		distclean: distclean-am

		maintainer-clean-am: maintainer-clean-generic distclean-am
		@echo "This command is intended for maintainers to use;"
		@echo "it deletes files that may require special tools to rebuild."

		maintainer-clean: maintainer-clean-am

		.PHONY: tags distdir info-am info dvi-am dvi check check-am \
		installcheck-am installcheck install-exec-am install-exec \
		install-data-am install-data install-am install uninstall-am uninstall \
		all-redirect all-am all installdirs mostlyclean-generic \
		distclean-generic clean-generic maintainer-clean-generic clean \
		mostlyclean distclean maintainer-clean


		cell-struct.eps: cell-struct.fig
		fig2dev -L eps $< $@
		interaction.eps: interaction.fig
		fig2dev -L eps $< $@
		cell-struct.pdf: cell-struct.fig
		fig2dev -L pdf $< $@
		interaction.pdf: interaction.fig
		fig2dev -L pdf $< $@

		tor-design.ps: cell-struct.eps interaction.eps tor-design.bib tor-design.tex usenix.sty latex8.bst
		latex tor-design.tex
		bibtex tor-design
		latex tor-design.tex
		latex tor-design.tex
		dvips -o $@ tor-design.dvi

		tor-design.pdf: cell-struct.pdf interaction.pdf tor-design.bib tor-design.tex usenix.sty latex8.bst
		pdflatex tor-design.tex
		bibtex tor-design
		pdflatex tor-design.tex
		pdflatex tor-design.tex

		# Tell versions [3.59,3.63) of GNU make to not export all variables.
		# Otherwise a system limit (for SysV at least) may be exceeded.
		.NOEXPORT: