diff options
| author | cypherpunks <cypherpunks@torproject.org> | 2016-01-08 13:05:46 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-01-08 13:27:36 -0800 |
| commit | 4c10a9c445e825886c658d67f5e44fdae37ffea3 (patch) | |
| tree | 373f8cf1b15af197efe6673329a303d78bee0002 | |
| parent | fb373a9ef6f07229b20cf1176522c625cd5c0a4d (diff) | |
| download | tor-4c10a9c445e825886c658d67f5e44fdae37ffea3.tar.gz tor-4c10a9c445e825886c658d67f5e44fdae37ffea3.zip | |
Simplify micro-revision dependency rules
The Automake variable OBJEXT is automatically adjusted to the correct
object file extension for the target platform.
| -rw-r--r-- | src/common/include.am | 6 | ||||
| -rw-r--r-- | 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 d82c093d1e..5afb30da6a 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 14ad05b3e9..712ae18406 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)\"" \ |