projects / packages / syslog-ng.git / blame
| Commit | Line | Data |
|---|---|---|
| 118f372b JB |
1 | #--- syslog-ng-3.5.2/configure.ac~ 2013-12-01 22:52:03.000000000 +0100 |
| 2 | #+++ syslog-ng-3.5.2/configure.ac 2013-12-01 23:02:32.955209559 +0100 | |
| 3 | #@@ -1145,7 +1145,7 @@ | |
| 4 | # else | |
| 5 | # SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS " | |
| 6 | # TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS" | |
| 7 | #- CORE_DEPS_LIBS="" | |
| 8 | #+ CORE_DEPS_LIBS="$GLIB_LIBS $EVTLOG_LIBS $LIBCAP_LIBS $IVYKIS_LIBS" | |
| 9 | # | |
| 10 | # # bypass libtool in case we want to do mixed linking because it | |
| 11 | # # doesn't support -Wl,-Bstatic -Wl,-Bdynamic on a per-library basis. | |
| 12 | --- syslog-ng-3.6.3/syslog-ng-ctl/Makefile.am.orig 2015-06-08 15:44:04.000000000 +0200 | |
| 13 | +++ syslog-ng-3.6.3/syslog-ng-ctl/Makefile.am 2015-06-14 12:14:41.989973064 +0200 | |
| e803f395 | 14 | @@ -10,5 +10,6 @@ syslog_ng_ctl_syslog_ng_ctl_SOURCES = |
| 118f372b JB |
15 | EXTRA_DIST += \ |
| 16 | syslog-ng-ctl/control-client-unix.c | |
| 17 | ||
| e803f395 AM |
18 | -syslog_ng_ctl_syslog_ng_ctl_LDADD = lib/libsyslog-ng.la @BASE_LIBS@ @GLIB_LIBS@ @RESOLV_LIBS@ |
| 19 | - | |
| 20 | +syslog_ng_ctl_syslog_ng_ctl_DEPENDENCIES = lib/libsyslog-ng.la | |
| 118f372b JB |
21 | +syslog_ng_ctl_syslog_ng_ctl_LDADD = -L${top_builddir}/lib/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@ |
| 22 | +syslog_ng_ctl_syslog_ng_ctl_LINK = @SYSLOGNG_LINK@ | |
| 118f372b JB |
23 | --- syslog-ng-3.6.3/lib/logproto/tests/Makefile.am.orig 2015-06-08 15:44:04.000000000 +0200 |
| 24 | +++ syslog-ng-3.6.3/lib/logproto/tests/Makefile.am 2015-06-14 12:29:25.672597931 +0200 | |
| 25 | @@ -20,7 +20,7 @@ | |
| 26 | ||
| 27 | lib_logproto_tests_test_findeom_CFLAGS = -I${top_srcdir}/libtest | |
| 28 | lib_logproto_tests_test_findeom_LDADD = \ | |
| 29 | - ${top_builddir}/lib/libsyslog-ng.la \ | |
| 30 | + $(TEST_LDADD) \ | |
| 31 | ${top_builddir}/libtest/libsyslog-ng-test.a | |
| 32 | lib_logproto_tests_test_findeom_SOURCES = \ | |
| 33 | lib/logproto/tests/test_findeom.c | |
| eebad2d5 JR |
34 | --- syslog-ng-3.8.1/modules/diskq/Makefile.am~ 2016-10-29 16:04:03.000000000 +0200 |
| 35 | +++ syslog-ng-3.8.1/modules/diskq/Makefile.am 2016-10-29 16:04:53.759617687 +0200 | |
| 36 | @@ -45,9 +45,9 @@ | |
| 37 | modules_diskq_libdisk_buffer_la_DEPENDENCIES = $(MODULE_DEPS_LIBS) $(LIBSYSLOG_NG_DISK_BUFFER) | |
| 38 | ||
| 39 | modules_diskq_dqtool_SOURCES = modules/diskq/dqtool.c | |
| 40 | modules_diskq_dqtool_LDADD = \ | |
| 41 | - $(TOOL_DEPS_LIBS) \ | |
| 42 | $(MODULE_DEPS_LIBS) \ | |
| 43 | + $(TOOL_DEPS_LIBS) \ | |
| 44 | $(LIBSYSLOG_NG_DISK_BUFFER) | |
| 45 | ||
| 46 | modules/diskq modules/diskq/ mod-diskq: modules/diskq/libdisk-buffer.la \ |