build: Abolish the `$e', `$o' and `$t' variables.
authorMark Wooding <mdw@distorted.org.uk>
Sun, 15 May 2016 14:29:05 +0000 (15:29 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 16 May 2016 00:32:29 +0000 (01:32 +0100)
I don't think anything ever used `$o'.  This project didn't use `$t'.
And use of `$e' gets in the way of Automake's magic handling of
executable suffixes under Cygwin.

hash/Makefile.am
vars.am

index f20c251..c6c7bb6 100644 (file)
@@ -49,7 +49,7 @@ PRECOMPS              += $(precomp)/crc32-tab.c
 if !CROSS_COMPILING
 $(precomp)/crc32-tab.c:
        @$(mkdir_p) $(precomp)
-       @$(MAKE) crc-mktab$e
+       @$(MAKE) crc-mktab$(EXEEXT)
        $(AM_V_GEN)./crc-mktab -o $@.new \
                -p0x04c11db7 -b32 -B8 -r -c \
                -scrc32_table -icrc32.h -tuint32 && \
@@ -80,7 +80,7 @@ PRECOMPS              += $(precomp)/unihash-global.c
 if !CROSS_COMPILING
 $(precomp)/unihash-global.c:
        @$(mkdir_p) $(precomp)
-       @$(MAKE) unihash-mkstatic$e
+       @$(MAKE) unihash-mkstatic$(EXEEXT)
        $(AM_V_GEN)./unihash-mkstatic -c -sunihash_global -iunihash.h \
                -o$@.new && mv $@.new $@
 endif
diff --git a/vars.am b/vars.am
index 8d34b68..79a60a5 100644 (file)
--- a/vars.am
+++ b/vars.am
 ###--------------------------------------------------------------------------
 ### Miscellaneous useful definitions.
 
-## Some convenient abbreviations for file suffixes.
-e                       = $(EXEEXT)
-o                       = $(OBJEXT)
-t                       = t$e
-
 ## Installation directories.
 pkglibexecdir           = $(libexecdir)/$(PACKAGE)