From 1d6526fe1b78789bff330f337bc41b5b2782440a Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Tue, 27 Feb 2018 01:03:33 +0100
Subject: [PATCH] Unit tests update

---
 src/test/Makefile.am | 4 ++--
 src/test/Makefile.in | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 16a0d364..81dac9e6 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -2,10 +2,10 @@
 # Makefile.am  -  The Final Cut unit tests programs
 #----------------------------------------------------------------------
 
+if CPPUNIT_TEST
 AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal $(CPPUNIT_LIBS)
 AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
 
-if CPPUNIT_TEST
 noinst_PROGRAMS = \
 	fstring_test
 
@@ -14,9 +14,9 @@ fstring_test_SOURCES = fstring-test.cpp
 TESTS = fstring_test
 
 check_PROGRAMS = $(TESTS)
-endif
 
 test: check
+endif
 
 clean-local:
 	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index 0043a843..63f82b25 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -501,8 +501,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal $(CPPUNIT_LIBS)
-AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
+@CPPUNIT_TEST_TRUE@AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal $(CPPUNIT_LIBS)
+@CPPUNIT_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
 @CPPUNIT_TEST_TRUE@fstring_test_SOURCES = fstring-test.cpp
 all: all-am
 
@@ -969,7 +969,7 @@ uninstall-am:
 	uninstall-am
 
 
-test: check
+@CPPUNIT_TEST_TRUE@test: check
 
 clean-local:
 	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete