Don't use assert() to check the results of pthread_*() calls.

[meshlink] / examples / Makefile.am

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 09cd3a370c54b51937b25671371ad090a08e0f35..36de6e24a6c53c22777ec2afd0e1e66bc474acc0 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,18 +1,29 @@
-noinst_PROGRAMS = meshlinkapp chat chatpp manynodes channels
+noinst_PROGRAMS = meshlinkapp chat chatpp manynodes channels groupchat
 
-AM_CPPFLAGS = -I../src -Wall
+AM_CPPFLAGS = $(PTHREAD_CFLAGS) -I${top_srcdir}/src -iquote. -Wall
+AM_LDFLAGS = $(PTHREAD_LIBS)
 
 meshlinkapp_SOURCES = meshlinkapp.c
-meshlinkapp_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+meshlinkapp_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
 chat_SOURCES = chat.c
-chat_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+chat_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
+noinst_PROGRAMS += chatpp
 chatpp_SOURCES = chatpp.cc
-chatpp_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+chatpp_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
-manynodes_SOURCES = manynodes.cc
-manynodes_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+manynodes_SOURCES = manynodes.c
+manynodes_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
 
 channels_SOURCES = channels.c
-channels_LDADD = ../src/libmeshlink.la ../catta/src/libcatta.la
+channels_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la
+
+if MONITOR
+noinst_PROGRAMS += monitor
+monitor_SOURCES = monitor.c
+monitor_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la $(NCURSES_LIBS) -lm
+endif
+
+groupchat_SOURCES = groupchat.c
+groupchat_LDADD = ${top_builddir}/src/libmeshlink.la ${top_builddir}/catta/src/libcatta.la