Use AX_PTHREAD to set the proper pthread flags.

[meshlink] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 630f5d7d91823d177f45192b1b190f496dee4cb2..f364215bcf9472cd7718d8ee622bc2947e6e273f 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,17 +1,34 @@
 TESTS = \
        basic.test \
        basicpp.test \
+       trio.test \
        channels.test \
        channels-fork.test \
+       channels-cornercases.test \
        import-export.test \
        invite-join.test \
        sign-verify.test
 
 dist_check_SCRIPTS = $(TESTS)
 
-AM_CPPFLAGS = -I../src
-
-check_PROGRAMS = basic basicpp channels channels-fork import-export invite-join sign-verify echo-fork
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_LDFLAGS = $(PTHREAD_LIBS)
+
+check_PROGRAMS = \
+       basic \
+       basicpp \
+       trio \
+       channels \
+       channels-fork \
+       channels-cornercases \
+       import-export \
+       invite-join \
+       sign-verify \
+       echo-fork
+
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
 
 basic_SOURCES = basic.c
 basic_LDADD = ../src/libmeshlink.la
@@ -19,12 +36,18 @@ basic_LDADD = ../src/libmeshlink.la
 basicpp_SOURCES = basicpp.cpp
 basicpp_LDADD = ../src/libmeshlink.la
 
-channels_SOURCES = channels.cpp
+trio_SOURCES = trio.c
+trio_LDADD = ../src/libmeshlink.la
+
+channels_SOURCES = channels.c
 channels_LDADD = ../src/libmeshlink.la
 
-channels_fork_SOURCES = channels-fork.cpp
+channels_fork_SOURCES = channels-fork.c
 channels_fork_LDADD = ../src/libmeshlink.la
 
+channels_cornercases_SOURCES = channels-cornercases.c utils.c utils.h
+channels_cornercases_LDADD = ../src/libmeshlink.la
+
 echo_fork_SOURCES = echo-fork.c
 echo_fork_LDADD = ../src/libmeshlink.la
 
@@ -36,6 +59,3 @@ invite_join_LDADD = ../src/libmeshlink.la
 
 sign_verify_SOURCES = sign-verify.c
 sign_verify_LDADD = ../src/libmeshlink.la
-
-channels_SOURCES = channels.c
-channels_LDADD = ../src/libmeshlink.la