diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
commit | 92d10abc1b66907f84b82d2d34552a90b852aa5f (patch) | |
tree | 8a90476f1ab39e133ff741ea2ad18010335b2b87 /runtime/Makefile.am | |
parent | b22990c6d359ffdedbf266672b8c875964b81d64 (diff) | |
parent | 4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6 (diff) | |
download | rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.gz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.xz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.zip |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'runtime/Makefile.am')
-rw-r--r-- | runtime/Makefile.am | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index eaae9705..838c15bd 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -122,6 +122,13 @@ lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) lmnetstrms_la_LDFLAGS = -module -avoid-version lmnetstrms_la_LIBADD = +# generic stream server framework +pkglib_LTLIBRARIES += lmstrmsrv.la +lmstrmsrv_la_SOURCES = strmsrv.c strmsrv.h strms_sess.c strms_sess.h +lmstrmsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) +lmstrmsrv_la_LDFLAGS = -module -avoid-version +lmstrmsrv_la_LIBADD = + # netstream drivers # plain tcp driver - main driver |