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

[catacomb] / vars.am

diff --git a/vars.am b/vars.am
index 56502879af02f62e294603e2a81f6fb08542e01e..ea5cbc0ef2c3797052bb3a2932669f71c7489e7c 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -27,11 +27,6 @@
 ###--------------------------------------------------------------------------
 ### Miscellaneous useful definitions.
 
 ###--------------------------------------------------------------------------
 ### Miscellaneous useful definitions.
 

-## Some convenient abbreviations for file suffixes.
-e                       = $(EXEEXT)
-o                       = $(OBJEXT)
-t                       = t$e
-

 ## Installation directories.
 archincludedir          = $(pkglibdir)/include
 
 ## Installation directories.
 archincludedir          = $(pkglibdir)/include
 


@@ -113,13 +108,13 @@ AM_CPPFLAGS                = $(CATACOMB_INCLUDES)
 ###--------------------------------------------------------------------------
 ### Testing.
 
 ###--------------------------------------------------------------------------
 ### Testing.
 

-SUFFIXES               += .c .$t .to
+SUFFIXES               += .c .t$(EXEEXT) .to

 .c.to:
        $(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@
 .c.to:
        $(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@

-.to.$t:
+.to.t$(EXEEXT):

        $(AM_V_CCLD)$(LINK) $< $(TEST_LIBS) $(top_builddir)/libcatacomb.la \
                $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
 .PRECIOUS: %.to
        $(AM_V_CCLD)$(LINK) $< $(TEST_LIBS) $(top_builddir)/libcatacomb.la \
                $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
 .PRECIOUS: %.to

-CLEANFILES             += *.to *.$t
+CLEANFILES             += *.to *.t$(EXEEXT)

 
 ###----- That's all, folks --------------------------------------------------
 
 ###----- That's all, folks --------------------------------------------------