summaryrefslogtreecommitdiffstats
path: root/plugins/imklog/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-23 18:19:19 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-23 18:19:19 +0100
commitb826c0d3c53bc9da7014d8e75f6e3db8853b7c19 (patch)
treeb3db136363f60d648fb8e1cbe8bea88226e2dc74 /plugins/imklog/Makefile.am
parentb68af9a016c229259ccb259c33e6598a3a77ea35 (diff)
parentcca05921dcfab557a4743a56c78683e4c1113e2a (diff)
downloadrsyslog-b826c0d3c53bc9da7014d8e75f6e3db8853b7c19.tar.gz
rsyslog-b826c0d3c53bc9da7014d8e75f6e3db8853b7c19.tar.xz
rsyslog-b826c0d3c53bc9da7014d8e75f6e3db8853b7c19.zip
Merge branch 'v5-devel' & fix bug in BSD imklog driver
Conflicts: plugins/imklog/ksym.c plugins/imklog/linux.c
Diffstat (limited to 'plugins/imklog/Makefile.am')
-rw-r--r--plugins/imklog/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/imklog/Makefile.am b/plugins/imklog/Makefile.am
index 5d4d0465..7d0d37c9 100644
--- a/plugins/imklog/Makefile.am
+++ b/plugins/imklog/Makefile.am
@@ -1,5 +1,4 @@
pkglib_LTLIBRARIES = imklog.la
-
imklog_la_SOURCES = imklog.c imklog.h
# select klog "driver"
@@ -8,7 +7,7 @@ imklog_la_SOURCES += bsd.c
endif
if ENABLE_IMKLOG_LINUX
-imklog_la_SOURCES += linux.c module.h ksym.c ksyms.h ksym_mod.c
+imklog_la_SOURCES += bsd.c
endif
imklog_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)