diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:46:37 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:46:37 +0200 |
| commit | 805061b34a2273b487f799fc8e8554abbd70a2d7 (patch) | |
| tree | 97a24a3b138ae4e904dcc1436e345548394197e8 /tools | |
| parent | 23ea66872b6929fec46c1c120967750a25ca4425 (diff) | |
| parent | f4f55b6b9d0026d9303978897a8af9c4b72a88bb (diff) | |
| download | rsyslog-805061b34a2273b487f799fc8e8554abbd70a2d7.tar.gz rsyslog-805061b34a2273b487f799fc8e8554abbd70a2d7.tar.bz2 rsyslog-805061b34a2273b487f799fc8e8554abbd70a2d7.zip | |
Merge branch 'beta'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 68e5769b..25761708 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -35,8 +35,7 @@ rsyslogd_SOURCES = \ pidfile.c \ pidfile.h \ \ - ../dirty.h \ - ../runtime/librsyslog.la + ../dirty.h rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(CNF_LIBS) # note: it looks like librsyslog.la must be explicitely given on LDDADD, # otherwise dependencies are not properly calculated (resulting in a |