diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:43:45 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:43:45 +0200 |
commit | 4b05bef636c11cbaf4d32097ed9656a1447ed3d0 (patch) | |
tree | 15c698fa86a85e5e3a1db1f14e2eaf6f11c6948f /runtime/Makefile.am | |
parent | 82095efa24ea0692a6747d4296f398ebd37e5339 (diff) | |
parent | a7040a9623e228043209da897dbf30b9ab02d771 (diff) | |
download | rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.tar.gz rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.tar.xz rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.zip |
Merge branch 'sock-abstract' into tls
Conflicts:
runtime/Makefile.am
runtime/netstrm.c
runtime/nsd.h
runtime/nsd_ptcp.c
runtime/rsyslog.h
Diffstat (limited to 'runtime/Makefile.am')
-rw-r--r-- | runtime/Makefile.am | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 1d07e79c..15efcbb8 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -81,7 +81,7 @@ lmregexp_la_LIBADD = endif if ENABLE_INET -pkglib_LTLIBRARIES += lmnet.la lmnetstrm.la +pkglib_LTLIBRARIES += lmnet.la lmnetstrms.la lmnetstrm.la lmnssel.la # # network support # @@ -90,18 +90,39 @@ lmnet_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) lmnet_la_LDFLAGS = -module -avoid-version lmnet_la_LIBADD = -# network streams +# network stream master class and stream factory +lmnetstrms_la_SOURCES = netstrms.c netstrms.h +lmnetstrms_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) +lmnetstrms_la_LDFLAGS = -module -avoid-version +lmnetstrms_la_LIBADD = + +# individual network streams lmnetstrm_la_SOURCES = netstrm.c netstrm.h lmnetstrm_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) lmnetstrm_la_LDFLAGS = -module -avoid-version lmnetstrm_la_LIBADD = -# plain tcp netstream driver +# network stream select support (a helper class) +lmnssel_la_SOURCES = nssel.c nssel.h +lmnssel_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) +lmnssel_la_LDFLAGS = -module -avoid-version +lmnssel_la_LIBADD = + +# netstream drivers + +# plain tcp driver - main driver pkglib_LTLIBRARIES += lmnsd_ptcp.la lmnsd_ptcp_la_SOURCES = nsd_ptcp.c nsd_ptcp.h lmnsd_ptcp_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) lmnsd_ptcp_la_LDFLAGS = -module -avoid-version lmnsd_ptcp_la_LIBADD = + +# select interface for ptcp driver +pkglib_LTLIBRARIES += lmnsdsel_ptcp.la +lmnsdsel_ptcp_la_SOURCES = nsdsel_ptcp.c nsdsel_ptcp.h +lmnsdsel_ptcp_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) +lmnsdsel_ptcp_la_LDFLAGS = -module -avoid-version +lmnsdsel_ptcp_la_LIBADD = endif # if ENABLE_INET # |