Fix building the tarball

This removes the Makefile.am from doc/design-paper and replaces it with
a static Makefile. We don't need to call it during the normal Tor build
process, as we don't need its targets normally. Keeping it around in
case we want to rebuild the pdf or ps files later.

diff --git a/.gitignore b/.gitignore
index cb8ad9c797ec2ebe26dce4c1b36284416a3c66dd..caa1352033ffe3b6ec008df9318b181c2dd76aad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -110,10 +110,6 @@
 /doc/torify.html
 /doc/torify.html.in
 
-# /doc/design-paper/
-/doc/design-paper/Makefile
-/doc/design-paper/Makefile.in
-
 # /doc/spec/
 /doc/spec/Makefile
 /doc/spec/Makefile.in

diff --git a/configure.in b/configure.in
index 3f9ee94147f6806d46bafbaa51284515b90a9e2d..0570a1fc6ca62acb4cf25275b6f5462bbb4ca922 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -876,7 +876,7 @@ fi
 
 CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
 
-AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
+AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample src/Makefile doc/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
 AC_OUTPUT
 
 if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 45379d18b9831a63f54e5e09f6cd7c5aff62dc17..d28c5712473bb28be5beda302fb5ca693e68feaf 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,7 +30,7 @@ doc_DATA = $(asciidoc_files:=.html)
 
 asciidoc_product = $(nodist_man_MANS) $(doc_DATA)
 
-SUBDIRS = design-paper spec
+SUBDIRS = spec
 
 DIST_SUBDIRS = spec
 

diff --git a/doc/design-paper/Makefile.am b/doc/design-paper/Makefile
similarity index 66%
rename from doc/design-paper/Makefile.am
rename to doc/design-paper/Makefile
index fb94706d07ea48f0bfbbf83936597081dd9b8ce6..3fdbbec131df1701f1ad80904917c3b04378d961 100644 (file)
--- a/doc/design-paper/Makefile.am
+++ b/doc/design-paper/Makefile
@@ -1,4 +1,3 @@
-
 cell-struct.eps: cell-struct.fig
        fig2dev -L eps $< $@
 interaction.eps: interaction.fig
@@ -19,8 +18,4 @@ tor-design.pdf: cell-struct.pdf interaction.pdf tor-design.bib tor-design.tex us
        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 tor-design.pdf
+       pdflatex tor-design.tex
\ No newline at end of file