tidy up Makefile.am wrt. check variables

Signed-off-by: Hans Zandbelt <[email protected]>

Author: zandbelt

test/.gitignore

@@ -1,5 +1,4 @@
-/test
-/test-cmd
+/*.la
 /*.lo
 /*.o
 /*.slo
@@ -10,8 +9,10 @@
 /.dirstamp
 /*.gcno
 /*.gcda
-/test_jose
-/test_util
 /Makefile
 /Makefile.in
+/test
+/test-cmd
+/test_jose
+/test_util
 /test_cfg

test/Makefile.am

@@ -27,9 +27,12 @@ AM_CFLAGS += -DUSE_ZLIB @ZLIB_CFLAGS@
 LIBADD += @ZLIB_LIBS@
 endif
 
-noinst_HEADERS = helper.h
+noinst_LTLIBRARIES = libtest.la
+libtest_la_SOURCES = \
+	helper.c \
+	stub.c
 
-LDADD = ${top_builddir}/src/libauth_openidc.la ${LIBADD}
+noinst_HEADERS = helper.h
 
 noinst_PROGRAMS = test-cmd
 test_cmd_SOURCES = test-cmd.c stub.c
@@ -42,20 +45,13 @@ test_CFLAGS = ${AM_CFLAGS} -fPIC
 
 if HAVE_CHECK
 
-TESTS += test_jose
-test_jose_CFLAGS = @CHECK_CFLAGS@ ${AM_CFLAGS}
-test_jose_LDADD = @CHECK_LIBS@ ${LDADD}
-test_jose_SOURCES = test_jose.c helper.c stub.c
-
-TESTS += test_util
-test_util_CFLAGS = @CHECK_CFLAGS@ ${AM_CFLAGS}
-test_util_LDADD = @CHECK_LIBS@ ${LDADD}
-test_util_SOURCES = test_util.c helper.c stub.c
+LDADD = ${top_builddir}/src/libauth_openidc.la libtest.la ${LIBADD} @CHECK_LIBS@
+AM_CFLAGS += @CHECK_CFLAGS@
 
-TESTS += test_cfg
-test_cfg_CFLAGS = @CHECK_CFLAGS@ ${AM_CFLAGS}
-test_cfg_LDADD = @CHECK_LIBS@ ${LDADD}
-test_cfg_SOURCES = test_cfg.c helper.c stub.c
+TESTS += \
+	test_util \
+	test_cfg \
+	test_jose
 
 endif