From add42497a973056a3b83b86ab9b3a1d3d02a1912 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 5 Mar 2016 16:59:59 -0500
Subject: [PATCH 1/3] Add more dependencies to the .o files.

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 554ebb9..8104cf1 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,8 @@ include $(top_srcdir)/bench/Rules.mk
 
 all: test-timeout
 
-timeout.o: $(top_srcdir)/timeout.c
-test-timeout.o: $(top_srcdir)/test-timeout.c
+timeout.o: $(top_srcdir)/timeout.c $(top_srcdir)/timeout-bitops.c $(top_srcdir)/timeout.h $(top_srcdir)/timeout-debug.h
+test-timeout.o: $(top_srcdir)/test-timeout.c $(top_srcdir)/timeout.h
 
 timeout.o test-timeout.o:
 	@$(SHRC); echo_cmd $(CC) $(ALL_CFLAGS) -c -o $@ $${top_srcdir}/$(@F:%.o=%.c) $(ALL_CPPFLAGS)

From 07593c73c5575ba2a26bbb7e1c6c5ef5ca4be989 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 5 Mar 2016 17:01:33 -0500
Subject: [PATCH 2/3] Add test-bitops to build targets

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8104cf1..32c4ec0 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ LUA_APIS = 5.1 5.2 5.3
 include $(top_srcdir)/lua/Rules.mk
 include $(top_srcdir)/bench/Rules.mk
 
-all: test-timeout
+all: test-timeout test-bitops
 
 timeout.o: $(top_srcdir)/timeout.c $(top_srcdir)/timeout-bitops.c $(top_srcdir)/timeout.h $(top_srcdir)/timeout-debug.h
 test-timeout.o: $(top_srcdir)/test-timeout.c $(top_srcdir)/timeout.h
@@ -58,6 +58,9 @@ timeout.o test-timeout.o:
 test-timeout: timeout.o test-timeout.o
 	@$(SHRC); echo_cmd $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -o $@ timeout.o test-timeout.o
 
+test-bitops: $(top_srcdir)/timeout-bitops.c
+	@$(SHRC); echo_cmd $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DTEST_BITOPS -o $@ timeout-bitops.c
+
 .PHONY: clean clean~
 
 clean:

From 810deab2575778169e776ae7fc530154d0f57b86 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 5 Mar 2016 17:15:06 -0500
Subject: [PATCH 3/3] Add more products to .gitignore

---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitignore b/.gitignore
index 970fa92..73e7281 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+\#*
+.#*
 *.o
 *.gcda
 *.gcov
@@ -5,3 +7,8 @@
 *~
 *.so
 *.dSYM
+test-timeout
+test-bitops
+bench/*.dat
+bench/*.eps
+bench/*.pdf