[tor-commits] [tor/master] Mark all object files built based on micro-revision.i as depending on it

[nickm@xxxxxxxxxxxxxx]

commit 263f6d11fdbb665b026e3dc2d8e7260475c3ff4b
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Dec 26 13:43:13 2015 -0500

    Mark all object files built based on micro-revision.i as depending on it
    
    Fixes make -j for some users; fixes bug 17826.
    
    Bugfix on 0.2.5.1, when we started building testing versions of all
    the object files.
---
 changes/17826         |    5 +++++
 src/common/include.am |    5 ++++-
 src/or/include.am     |    5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/changes/17826 b/changes/17826
new file mode 100644
index 0000000..7d0a17a
--- /dev/null
+++ b/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.
+      
diff --git a/src/common/include.am b/src/common/include.am
index 2fc92e2..d82c093 100644
--- a/src/common/include.am
+++ b/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		\
diff --git a/src/or/include.am b/src/or/include.am
index dab0048..14ad05b 100644
--- a/src/or/include.am
+++ b/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)\""	\



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits