From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 15 May 2016 14:29:05 +0000 (+0100)
Subject: build: Abolish the `$e', `$o' and `$t' variables.
X-Git-Tag: 2.2.3~1
X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/commitdiff_plain/06fc8e0b5ddbfe10b7cac72500d06b32ab8377c6

build: Abolish the `$e', `$o' and `$t' variables.

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.
---

diff --git a/hash/Makefile.am b/hash/Makefile.am
index f20c251..c6c7bb6 100644
--- a/hash/Makefile.am
+++ b/hash/Makefile.am
@@ -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
--- a/vars.am
+++ b/vars.am
@@ -27,11 +27,6 @@
 ###--------------------------------------------------------------------------
 ### Miscellaneous useful definitions.
 
-## Some convenient abbreviations for file suffixes.
-e			 = $(EXEEXT)
-o			 = $(OBJEXT)
-t			 = t$e
-
 ## Installation directories.
 pkglibexecdir		 = $(libexecdir)/$(PACKAGE)