diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-04 22:31:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-18 12:58:04 +0200 |
| commit | d8142e2884c66bdec676d6b72503028c785669ba (patch) | |
| tree | f64fe00cd0b33de2380e7c662ffe61046547d557 | |
| parent | d9fe6affb31e9c45d342fbd944abafa8b074e43b (diff) | |
| download | rsyslog-d8142e2884c66bdec676d6b72503028c785669ba.tar.gz rsyslog-d8142e2884c66bdec676d6b72503028c785669ba.tar.bz2 rsyslog-d8142e2884c66bdec676d6b72503028c785669ba.zip | |
build: Drop unused CNF_LIBS variable
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index cc5830b6..519266f1 100644 --- a/configure.ac +++ b/configure.ac @@ -775,7 +775,6 @@ AC_ARG_ENABLE(rsyslogrt, if test "x$enable_rsyslogrt" = "xyes"; then RSRT_CFLAGS1="-I\$(top_srcdir)/runtime -I\$(top_srcdir) -I\$(top_srcdir)/grammar" RSRT_LIBS1="\$(top_builddir)/runtime/librsyslog.la" - #??CNF_LIBS="\$(top_builddir)/grammar/libgrammar.la" fi AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes) RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)" diff --git a/tools/Makefile.am b/tools/Makefile.am index 25761708..9d9bd352 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,11 +36,11 @@ rsyslogd_SOURCES = \ pidfile.h \ \ ../dirty.h -rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(CNF_LIBS) +rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) # note: it looks like librsyslog.la must be explicitely given on LDDADD, # otherwise dependencies are not properly calculated (resulting in a # potentially incomplete build, a problem we had several times...) -rsyslogd_LDADD = ../grammar/libgrammar.la ../runtime/librsyslog.la $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS) $(CNF_LIBS) $(LIBUUID_LIBS) +rsyslogd_LDADD = ../grammar/libgrammar.la ../runtime/librsyslog.la $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) $(LIBEE_LIBS) $(LIBLOGNORM_LIBS) $(LIBUUID_LIBS) rsyslogd_LDFLAGS = -export-dynamic if ENABLE_DIAGTOOLS |