summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Beier <[email protected]>2016-11-29 10:51:27 +0100
committerGitHub <[email protected]>2016-11-29 10:51:27 +0100
commit4c6bdcb460b18c05f98144217b16dc5922b3c52e (patch)
tree6a037795b3fef5a3fa26cb15524eaa8fb9fa3658
parente8f6ddeddf7992560811e06b4fa3fb58ea172e17 (diff)
parent0c68f37c4314f1c2cd867792878ba65d58dadff6 (diff)
downloadlibtdevnc-4c6bdcb460b18c05f98144217b16dc5922b3c52e.tar.gz
libtdevnc-4c6bdcb460b18c05f98144217b16dc5922b3c52e.zip
Merge pull request #140 from vapier/master
test/Makefile: use check_PROGRAMS
-rw-r--r--test/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 3b19d61..f07fc82 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,8 @@
+check_PROGRAMS =
if HAVE_LIBJPEG
# TurboJPEG wrapper tests
-noinst_PROGRAMS=tjunittest tjbench
+check_PROGRAMS += tjunittest tjbench
tjunittest_SOURCES=tjunittest.c ../common/turbojpeg.c ../common/turbojpeg.h \
tjutil.c tjutil.h
tjbench_SOURCES=tjbench.c ../common/turbojpeg.c ../common/turbojpeg.h \
@@ -19,7 +20,7 @@ endif
copyrecttest_LDADD=$(LDADD) -lm
-check_PROGRAMS=$(ENCODINGS_TEST) cargstest copyrecttest $(BACKGROUND_TEST) \
+check_PROGRAMS += $(ENCODINGS_TEST) cargstest copyrecttest $(BACKGROUND_TEST) \
cursortest
test: encodingstest$(EXEEXT) cargstest$(EXEEXT) copyrecttest$(EXEEXT)