From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 6 May 2020 09:18:44 +0000 (+0100)
Subject: Merge branch '2.4.x' into 2.5.x
X-Git-Tag: 2.5.2~6
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/ac82eac807a9818e676c316f8afeab5cff2572cd?hp=c20ac82cfc60ce33ab3f6361c535ef2d0523806f

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 b99cfcfe..115cb317 100644
--- 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)