Merge branch '2.4.x' into 2.5.x

* 2.4.x:
  vars.am: Don't build the test programs for installation.

diff --git a/vars.am b/vars.am
index b99cfcf..115cb31 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -120,12 +120,14 @@ SUFFIXES          += .c .t$(EXEEXT) .to
 .c.to:
        $(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@
 .to.t$(EXEEXT):
-       $(AM_V_CCLD)$(LINK) $< $(TEST_LIBS) $(top_builddir)/libcatacomb.la \
+       $(AM_V_CCLD)$(LINK) -no-install $< \
+               $(TEST_LIBS) $(top_builddir)/libcatacomb.la \
                $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
 %.to: %.c %.lo
        $(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@
 %.t$(EXEEXT): %.to $(TEST_LIBS) $(top_builddir)/libcatacomb.la
-       $(AM_V_CCLD)$(LINK) $+ $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
+       $(AM_V_CCLD)$(LINK) -no-install $+ \
+               $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
 
 .PRECIOUS: %.to %.t$(EXEEXT)
 CLEANFILES             += *.to *.t$(EXEEXT)