summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-16 17:28:29 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-16 17:28:29 +0200
commit4beff8dab6ff3d0cb2e386ca6c4b468371bef05a (patch)
treea2179a9847a555d05d31e3614377e9f5b6ca1857 /tests/Makefile.am
parent2d5e8ba7cd05a95f897506e51dcc5adb06dbcaa8 (diff)
parentf07d74a87f91b6fe2f5091ec2547b7886ab3a23e (diff)
downloadrsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.gz
rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.xz
rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.zip
Merge branch 'nextmaster' into oracle
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 53a81a93..87dca985 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,13 +28,16 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
testsuites/1.omod-if-array \
parsertest.sh \
manytcp.sh \
+ testsuites/manytcp.conf \
omod-if-array.sh \
cfg.sh
ourtail_SOURCES = ourtail.c
-tcpflood_SOURCES = tcpflood.c
chkseq_SOURCES = chkseq.c
+tcpflood_SOURCES = tcpflood.c
+tcpflood_LDADD = $(SOL_LIBS)
+
nettester_SOURCES = nettester.c getline.c
nettester_LDADD = $(SOL_LIBS)