Fix make distcheck.

diff --git a/src/Makefile.am b/src/Makefile.am
index 7d2e94e74921106802dfb29c2165d95318b1544a..93e2e5677da9af5d4078ed4156955081b26dc348 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,6 +64,7 @@ libmeshlink_la_SOURCES = \
        netutl.c netutl.h \
        node.c node.h \
        submesh.c submesh.h \
+       packmsg.h \
        prf.c prf.h \
        protocol.c protocol.h \
        protocol_auth.c \

diff --git a/test/.gitignore b/test/.gitignore
index 98cd87cd56873ff7e1705d8251cb39f22c23a07c..b1dd28e26ff206b6ffab28adeaf96e6de55ab77e 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -14,3 +14,5 @@
 /sign-verify
 /trio
 /*.[0123456789]
+/channels_aio_fd.in
+/channels_aio_fd.out*

diff --git a/test/Makefile.am b/test/Makefile.am
index 2a022a6c87b64e41af4361bf399182b02a86b621..10d1fe5c09c9e9b16b02383b69070cebbfccaea2 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -60,64 +60,64 @@ bin_PROGRAMS = $(check_PROGRAMS)
 endif
 
 basic_SOURCES = basic.c utils.c utils.h
-basic_LDADD = ../src/libmeshlink.la
+basic_LDADD = $(top_builddir)/src/libmeshlink.la
 
 basicpp_SOURCES = basicpp.cpp utils.c utils.h
-basicpp_LDADD = ../src/libmeshlink.la
+basicpp_LDADD = $(top_builddir)/src/libmeshlink.la
 
 blacklist_SOURCES = blacklist.c utils.c utils.h
-blacklist_LDADD = ../src/libmeshlink.la
+blacklist_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_SOURCES = channels.c utils.c utils.h
-channels_LDADD = ../src/libmeshlink.la
+channels_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_aio_SOURCES = channels-aio.c utils.c utils.h
-channels_aio_LDADD = ../src/libmeshlink.la
+channels_aio_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_aio_fd_SOURCES = channels-aio-fd.c utils.c utils.h
-channels_aio_fd_LDADD = ../src/libmeshlink.la
+channels_aio_fd_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_no_partial_SOURCES = channels-no-partial.c utils.c utils.h
-channels_no_partial_LDADD = ../src/libmeshlink.la
+channels_no_partial_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_failure_SOURCES = channels-failure.c utils.c utils.h
-channels_failure_LDADD = ../src/libmeshlink.la
+channels_failure_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_fork_SOURCES = channels-fork.c utils.c utils.h
-channels_fork_LDADD = ../src/libmeshlink.la
+channels_fork_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_cornercases_SOURCES = channels-cornercases.c utils.c utils.h
-channels_cornercases_LDADD = ../src/libmeshlink.la
+channels_cornercases_LDADD = $(top_builddir)/src/libmeshlink.la
 
 channels_udp_SOURCES = channels-udp.c utils.c utils.h
-channels_udp_LDADD = ../src/libmeshlink.la
+channels_udp_LDADD = $(top_builddir)/src/libmeshlink.la
 
 duplicate_SOURCES = duplicate.c utils.c utils.h
-duplicate_LDADD = ../src/libmeshlink.la
+duplicate_LDADD = $(top_builddir)/src/libmeshlink.la
 
 echo_fork_SOURCES = echo-fork.c utils.c utils.h
-echo_fork_LDADD = ../src/libmeshlink.la
+echo_fork_LDADD = $(top_builddir)/src/libmeshlink.la
 
 encrypted_SOURCES = encrypted.c utils.c utils.h
-encrypted_LDADD = ../src/libmeshlink.la
+encrypted_LDADD = $(top_builddir)/src/libmeshlink.la
 
 ephemeral_SOURCES = ephemeral.c utils.c utils.h
-ephemeral_LDADD = ../src/libmeshlink.la
+ephemeral_LDADD = $(top_builddir)/src/libmeshlink.la
 
 get_all_nodes_SOURCES = get-all-nodes.c utils.c utils.h
-get_all_nodes_LDADD = ../src/libmeshlink.la
+get_all_nodes_LDADD = $(top_builddir)/src/libmeshlink.la
 
 import_export_SOURCES = import-export.c utils.c utils.h
-import_export_LDADD = ../src/libmeshlink.la
+import_export_LDADD = $(top_builddir)/src/libmeshlink.la
 
 invite_join_SOURCES = invite-join.c utils.c utils.h
-invite_join_LDADD = ../src/libmeshlink.la
+invite_join_LDADD = $(top_builddir)/src/libmeshlink.la
 
 sign_verify_SOURCES = sign-verify.c utils.c utils.h
-sign_verify_LDADD = ../src/libmeshlink.la
+sign_verify_LDADD = $(top_builddir)/src/libmeshlink.la
 
 trio_SOURCES = trio.c utils.c utils.h
-trio_LDADD = ../src/libmeshlink.la
+trio_LDADD = $(top_builddir)/src/libmeshlink.la
 
 trio2_SOURCES = trio2.c utils.c utils.h
-trio2_LDADD = ../src/libmeshlink.la
+trio2_LDADD = $(top_builddir)/src/libmeshlink.la

diff --git a/test/utcp-benchmark b/test/utcp-benchmark
index d8eafd77b9de166636bd7356bc155d7cac18a69e..bf277fc4784dac116569054eb7257aac8789cc04 100755 (executable)
--- a/test/utcp-benchmark
+++ b/test/utcp-benchmark
@@ -65,9 +65,9 @@ kill $(jobs -p) 2>/dev/null
 
 # Test using UTCP
 ip netns exec utcp-right tcpdump -i utcp-right -w $LOG_PREFIX-utcp.pcap udp port 9999 2>/dev/null &
-ip netns exec utcp-left ./test 9999 2>$LOG_PREFIX-server.txt >/dev/null &
+ip netns exec utcp-left ../src/utcp-test 9999 2>$LOG_PREFIX-server.txt >/dev/null &
 sleep 0.1
-head -c $SIZE /dev/zero | ip netns exec utcp-right time ./test 192.168.1.1 9999 2>$LOG_PREFIX-client.txt >/dev/null
+head -c $SIZE /dev/zero | ip netns exec utcp-right time ../src/utcp-test 192.168.1.1 9999 2>$LOG_PREFIX-client.txt >/dev/null
 sleep 0.1
 kill $(jobs -p) 2>/dev/null
 

diff --git a/test/utcp-benchmark-stream b/test/utcp-benchmark-stream
index 88c32e3751ba280c49df351bd0f7b8cff1818610..1935820cbabc19452cb11ddf8bf33c5782f59b70 100755 (executable)
--- a/test/utcp-benchmark-stream
+++ b/test/utcp-benchmark-stream
@@ -70,9 +70,9 @@ kill $(jobs -p) 2>/dev/null
 
 # Test using UTCP
 ip netns exec utcp-right tcpdump -i utcp-right -w $LOG_PREFIX-utcp.pcap udp port 9999 2>/dev/null &
-ip netns exec utcp-left ./test 9999 2>$LOG_PREFIX-server.txt </dev/null | ./stream -r $STREAMRATE -t $SIZE -v &
+ip netns exec utcp-left ../src/utcp-test 9999 2>$LOG_PREFIX-server.txt </dev/null | ./stream -r $STREAMRATE -t $SIZE -v &
 sleep 0.1
-./stream -r $STREAMRATE -t $SIZE | ip netns exec utcp-right time ./test 192.168.1.1 9999 2>$LOG_PREFIX-client.txt >/dev/null
+./stream -r $STREAMRATE -t $SIZE | ip netns exec utcp-right time ../src/utcp-test 192.168.1.1 9999 2>$LOG_PREFIX-client.txt >/dev/null
 sleep 0.1
 kill $(jobs -p) 2>/dev/null