diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:44:34 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-04 18:44:34 +0200 |
| commit | 91613812af74d796fd4401507bbd6229a268bc1e (patch) | |
| tree | 51e1aa15119cbd66cdb76965ee28a56718729783 /tools | |
| parent | c8cf7313a19496044f755ba10c1a9bd4ba94ec37 (diff) | |
| parent | 76c80165e969a37c0fc176661879661c20e9a198 (diff) | |
| download | rsyslog-91613812af74d796fd4401507bbd6229a268bc1e.tar.gz rsyslog-91613812af74d796fd4401507bbd6229a268bc1e.tar.xz rsyslog-91613812af74d796fd4401507bbd6229a268bc1e.zip | |
Merge branch 'v6-stable' into v6-devel
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 7f3ceef8..9dd4e3bd 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 |