Simplify micro-revision dependency rules

The Automake variable OBJEXT is automatically adjusted to the correct
object file extension for the target platform.

diff --git a/src/common/include.am b/src/common/include.am
index d82c093d1e642807778f46bbd7777d467fe64867..5afb30da6a4d73b67e11589c3fba5bcd754fcc12 100644 (file)
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -78,10 +78,8 @@ LIBOR_A_SOURCES = \
   $(threads_impl_source)                               \
   $(readpassphrase_source)
 
-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
+src/common/src_common_libor_testing_a-log.$(OBJEXT) \
+  src/common/log.$(OBJEXT): micro-revision.i
 
 LIBOR_CRYPTO_A_SOURCES = \
   src/common/aes.c             \

diff --git a/src/or/include.am b/src/or/include.am
index 14ad05b3e930568eb2f89002f6a12ffd5d836125..712ae18406ad135805fe1084631a420eb7635008 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -93,10 +93,8 @@ 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 \
-  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
+src/or/tor_main.$(OBJEXT) \
+  src/or/src_or_tor_cov-tor_main.$(OBJEXT): micro-revision.i
 
 AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\""                \
                -DLOCALSTATEDIR="\"$(localstatedir)\""  \