diff options
| author | Ton Voon <tonvoon@users.sourceforge.net> | 2006-12-06 20:34:31 +0000 |
|---|---|---|
| committer | Ton Voon <tonvoon@users.sourceforge.net> | 2006-12-06 20:34:31 +0000 |
| commit | 26725ccd159105e38e5ab4ddc9ef848a5253e6d2 (patch) | |
| tree | 10bc0a406e70916df3d940c68a01863e2431c917 | |
| parent | 899e9f865f331d099300ef920fc7c3b8abc9944f (diff) | |
| download | monitoring-plugins-26725ccd159105e38e5ab4ddc9ef848a5253e6d2.tar.gz | |
Move SSL libs to correct order per plugin
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1545 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | plugins/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index a8e896a2..69b016ac 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am | |||
| @@ -35,7 +35,7 @@ PLUGINHDRS = common.h | |||
| 35 | 35 | ||
| 36 | BASEOBJS = utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a | 36 | BASEOBJS = utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a |
| 37 | NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) | 37 | NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) |
| 38 | SSLOBJS = sslutils.o @SSLLIBS@ | 38 | SSLOBJS = sslutils.o |
| 39 | NETLIBS = $(NETOBJS) $(SOCKETLIBS) | 39 | NETLIBS = $(NETOBJS) $(SOCKETLIBS) |
| 40 | 40 | ||
| 41 | TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) | 41 | TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) |
| @@ -55,7 +55,7 @@ check_dns_LDADD = $(NETLIBS) runcmd.o | |||
| 55 | check_dummy_LDADD = $(BASEOBJS) | 55 | check_dummy_LDADD = $(BASEOBJS) |
| 56 | check_fping_LDADD = $(NETLIBS) popen.o | 56 | check_fping_LDADD = $(NETLIBS) popen.o |
| 57 | check_game_LDADD = $(BASEOBJS) runcmd.o | 57 | check_game_LDADD = $(BASEOBJS) runcmd.o |
| 58 | check_http_LDADD = $(SSLOBJS) $(NETLIBS) | 58 | check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS) |
| 59 | check_hpjd_LDADD = $(NETLIBS) popen.o | 59 | check_hpjd_LDADD = $(NETLIBS) popen.o |
| 60 | check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS) | 60 | check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS) |
| 61 | check_load_LDADD = $(BASEOBJS) popen.o | 61 | check_load_LDADD = $(BASEOBJS) popen.o |
| @@ -78,10 +78,10 @@ check_procs_LDADD = $(BASEOBJS) popen.o | |||
| 78 | check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS) | 78 | check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS) |
| 79 | check_real_LDADD = $(NETLIBS) | 79 | check_real_LDADD = $(NETLIBS) |
| 80 | check_snmp_LDADD = $(BASEOBJS) popen.o | 80 | check_snmp_LDADD = $(BASEOBJS) popen.o |
| 81 | check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) | 81 | check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS) |
| 82 | check_ssh_LDADD = $(NETLIBS) | 82 | check_ssh_LDADD = $(NETLIBS) |
| 83 | check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o | 83 | check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o |
| 84 | check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) | 84 | check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS) |
| 85 | check_time_LDADD = $(NETLIBS) | 85 | check_time_LDADD = $(NETLIBS) |
| 86 | check_ups_LDADD = $(NETLIBS) | 86 | check_ups_LDADD = $(NETLIBS) |
| 87 | check_users_LDADD = $(BASEOBJS) popen.o | 87 | check_users_LDADD = $(BASEOBJS) popen.o |