diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-02-24 14:52:49 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-02-24 14:52:49 +0100 |
| commit | 924ceb305dc1dced54beaa6ffe4b72b9f2609c6a (patch) | |
| tree | 1dd9c29e5bda8d7b6f4952827ffe9218bc060df4 /tools/Makefile.am | |
| parent | 46d7840b2500fd4cd3044ad06481f27ce97ee2ad (diff) | |
| parent | 24a36fd14226ccf5f139c07252f05f3db124604e (diff) | |
| download | rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.gz rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.xz rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index b66b8e0c..776279a5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,8 +21,8 @@ rsyslogd_SOURCES = \ pidfile.h \ \ ../dirty.h -rsyslogd_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags) -rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(rsrt_libs) +rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) +rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) rsyslogd_LDFLAGS = -export-dynamic if ENABLE_DIAGTOOLS |