Use AX_PTHREAD to set the proper pthread flags.

[meshlink] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 5f8921c903bb64b780a29c0d3faf537527e15bf4..f364215bcf9472cd7718d8ee622bc2947e6e273f 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,7 @@
 TESTS = \
        basic.test \
        basicpp.test \
+       trio.test \
        channels.test \
        channels-fork.test \
        channels-cornercases.test \
@@ -10,11 +11,13 @@ TESTS = \
 
 dist_check_SCRIPTS = $(TESTS)
 
-AM_CPPFLAGS = -I../src
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_LDFLAGS = $(PTHREAD_LIBS)
 
 check_PROGRAMS = \
        basic \
        basicpp \
+       trio \
        channels \
        channels-fork \
        channels-cornercases \
@@ -23,19 +26,26 @@ check_PROGRAMS = \
        sign-verify \
        echo-fork
 
+if INSTALL_TESTS
+bin_PROGRAMS = $(check_PROGRAMS)
+endif
+
 basic_SOURCES = basic.c
 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.cpp utils.cpp utils.h
+channels_cornercases_SOURCES = channels-cornercases.c utils.c utils.h
 channels_cornercases_LDADD = ../src/libmeshlink.la
 
 echo_fork_SOURCES = echo-fork.c
@@ -49,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