summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-05-16 15:11:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-05-16 15:11:24 +0200
commit29ebd4ab3e391aea53b6e337061d226359aeb993 (patch)
tree4ae2c32da9e8ed71109a2de600911df6dfdbd0d5 /Makefile.am
parentffa17a25d2c2098d4977d377cbf20d0136fea820 (diff)
parentdfb1f20ce71e69bf164c9b1d59e0b4cd9f81c252 (diff)
downloadrsyslog-29ebd4ab3e391aea53b6e337061d226359aeb993.tar.gz
rsyslog-29ebd4ab3e391aea53b6e337061d226359aeb993.tar.xz
rsyslog-29ebd4ab3e391aea53b6e337061d226359aeb993.zip
Merge branch 'master' into ietf-tls
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index b16e5beb..e4c4bea5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ lmtcpsrv_la_SOURCES = \
tcpsrv.c \
tcpsrv.h
lmtcpsrv_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
-lmtcpsrv_la_LDFLAGS = -module -avoid-version $(rsrt_libs)
+lmtcpsrv_la_LDFLAGS = -module -avoid-version
lmtcpsrv_la_LIBADD =
#
@@ -24,7 +24,7 @@ lmtcpclt_la_SOURCES = \
tcpclt.c \
tcpclt.h
lmtcpclt_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
-lmtcpclt_la_LDFLAGS = -module -avoid-version $(rsrt_libs)
+lmtcpclt_la_LDFLAGS = -module -avoid-version
lmtcpclt_la_LIBADD =
endif # if ENABLE_INET
@@ -36,15 +36,11 @@ if ENABLE_GSSAPI
pkglib_LTLIBRARIES += lmgssutil.la
lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
lmgssutil_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
-lmgssutil_la_LDFLAGS = -module -avoid-version $(rsrt_libs)
+lmgssutil_la_LDFLAGS = -module -avoid-version
lmgssutil_la_LIBADD = $(gss_libs)
endif
EXTRA_DIST = \
- redhat/rsyslog.conf \
- redhat/rsyslog.init \
- redhat/rsyslog.log \
- redhat/rsyslog.sysconfig \
freebsd/rsyslogd \
slackware/rc.rsyslogd \
contrib/README \