Merge remote-tracking branch 'public/17826_redux'

changes/17826

@@ -0,0 +1,5 @@
+  o Minor bugfixes (build):
+    - Mark all object files that include micro-revision.i as depending on
+      it, so as to make our build more reliable with parallel builds.
+      Fixes bug 17826; bugfix on 0.2.5.1-alpha.
+      

src/common/include.am

@@ -78,7 +78,10 @@ LIBOR_A_SOURCES = \
   $(threads_impl_source)				\
   $(readpassphrase_source)
 
-src/common/log.o: micro-revision.i
+src/common/src_common_libor_testing_a-log.o \
+  src/common/src_common_libor_testing_a-log.obj \
+  src/common/log.o \
+  src/common/log.obj : micro-revision.i
 
 LIBOR_CRYPTO_A_SOURCES = \
   src/common/aes.c		\

src/or/include.am

@@ -93,7 +93,10 @@ src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
 src_or_tor_SOURCES = src/or/tor_main.c
 AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or
 
-src/or/tor_main.o: micro-revision.i
+src/or/tor_main.o \
+  src/or/tor_main.obj \
+  src/or/src_or_tor_cov-tor_main.o \
+  src/or/src_or_tor_cov-tor_main.obj : micro-revision.i
 
 AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\""		\
 		-DLOCALSTATEDIR="\"$(localstatedir)\""	\