commit 4c10a9c445e825886c658d67f5e44fdae37ffea3 Author: cypherpunks cypherpunks@torproject.org Date: Fri Jan 8 13:05:46 2016 +0100

Simplify micro-revision dependency rules

The Automake variable OBJEXT is automatically adjusted to the correct object file extension for the target platform. --- src/common/include.am | 6 ++---- src/or/include.am | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/common/include.am b/src/common/include.am index d82c093..5afb30d 100644 --- 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 14ad05b..712ae18 100644 --- 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)"" \