[freehaven-cvs] Add target to correctly combine trial1/trial1u and t...

[nickm@seul.org (Nick Mathewson)]

Update of /home/freehaven/cvsroot/doc/e2e-traffic
In directory moria.mit.edu:/tmp/cvs-serv11534

Modified Files:
	Makefile 
Log Message:
Add target to correctly combine trial1/trial1u and trial2/trial2u

Index: Makefile
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	22 Jan 2004 03:51:00 -0000	1.2
+++ Makefile	22 Jan 2004 03:52:47 -0000	1.3
@@ -4,6 +4,9 @@
 
 e2e-traffic.dvi: e2e-traffic.tex
 	latex e2e-traffic.tex
+	bibtex e2e-traffic
+	latex e2e-traffic.tex
+	latex e2e-traffic.tex
 
 e2e-traffic.pdf: e2e-traffic.dvi
 	dvipdf e2e-traffic.dvi e2e-traffic.pdf
@@ -22,7 +25,6 @@
 words:
 	wc -w e2e-traffic.tex
 
-
 #----------------------------------------------------------------------
 PYTHON=python2.3
 ANALYZE=$(PYTHON) src/analyze.py
@@ -43,5 +45,10 @@
 	$(ANALYZE) raw*/trial5b* > results/trial5b.analyzed
 	$(ANALYZE) raw/trial6.* > results/trial6.analyzed
 
+combine:
+	./src/combine.py results/trial1.analyzed results/trial1u.analyzed > results/trial1c.analyzed
+	./src/combine.py results/trial2.analyzed results/trial2u.analyzed > results/trial2c.analyzed
+
 backup:
 	mkisofs -r -J backup.iso raw raw-partial results
+

***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs       in the body. http://freehaven.net/