diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-10 12:54:21 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-10 12:54:21 +0100 |
commit | f7c20920046ebcb94eadadf1ebad97b634a12a2d (patch) | |
tree | 0cf704f462fa7394842beb3a496627915d863426 /plugins/imudp/Makefile.am | |
parent | 58c486b36b27d30444b621876846052e239f8c50 (diff) | |
parent | 7742b2182fc017ca4c9fcfe3b26f4c8d68a9bd58 (diff) | |
download | rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.tar.gz rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.tar.xz rsyslog-f7c20920046ebcb94eadadf1ebad97b634a12a2d.zip |
Merge branch 'v5.6.2-newimudp' into v5-devel-newimudp
Conflicts:
plugins/imudp/imudp.c
threads.c
Diffstat (limited to 'plugins/imudp/Makefile.am')
-rw-r--r-- | plugins/imudp/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/imudp/Makefile.am b/plugins/imudp/Makefile.am index 517b1287..bc64b8c8 100644 --- a/plugins/imudp/Makefile.am +++ b/plugins/imudp/Makefile.am @@ -3,4 +3,4 @@ pkglib_LTLIBRARIES = imudp.la imudp_la_SOURCES = imudp.c imudp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) imudp_la_LDFLAGS = -module -avoid-version -imudp_la_LIBADD = +imudp_la_LIBADD = $(IMUDP_LIBS) |