diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-10-14 18:50:54 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-10-14 18:50:54 +0200 |
| commit | 68cb29a12f8f2a336088f087cdbc9e0e7aa92ae5 (patch) | |
| tree | b1a8739116bd994e85cfa4ac8a275b49678ba00b /test | |
| parent | 27bc3dba7089268b0247e91957fff498a43d08dc (diff) | |
| parent | 8415ff4c3517c6697d53e1a17bba35284f480891 (diff) | |
| download | libtdevnc-68cb29a12f8f2a336088f087cdbc9e0e7aa92ae5.tar.gz libtdevnc-68cb29a12f8f2a336088f087cdbc9e0e7aa92ae5.zip | |
Merge tag 'LibVNCServer-0.9.11' of https://github.com/LibVNC/libvncserver
Conflicts:
CMakeLists.txt
libvncserver/main.c
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 5 |
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) |