Only link programs that need it against OpenSSL.

This keeps vlogconf, in particular, from being linked against OpenSSL,
which in turn keeps the Debian package build tools from complaining that
the openflow-common package shouldn't need to depend on OpenSSL but does
because of the spurious library link.

diff --git a/Make.vars b/Make.vars
index 98a9e44..583d3eb 100644 (file)
--- a/Make.vars
+++ b/Make.vars
@@ -1,7 +1,6 @@
 # -*- makefile -*-
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
-LIBS = $(SSL_LIBS)
 
 COMMON_FLAGS = -DVERSION=\"$(VERSION)\"
 if NDEBUG

diff --git a/controller/Makefile.am b/controller/Makefile.am
index 1a5e01a..8202859 100644 (file)
--- a/controller/Makefile.am
+++ b/controller/Makefile.am
@@ -5,7 +5,7 @@ man_MANS = controller.8
 DISTCLEANFILES = controller.8
 
 controller_SOURCES = controller.c
-controller_LDADD = ../lib/libopenflow.la -ldl
+controller_LDADD = ../lib/libopenflow.la -ldl $(SSL_LIBS)
 
 EXTRA_DIST = controller.8.in
 controller.8: controller.8.in Makefile

diff --git a/secchan/Makefile.am b/secchan/Makefile.am
index c575b47..69b605f 100644 (file)
--- a/secchan/Makefile.am
+++ b/secchan/Makefile.am
@@ -9,7 +9,7 @@ man_MANS =
 endif
 
 secchan_SOURCES = secchan.c
-secchan_LDADD = ../lib/libopenflow.la -ldl
+secchan_LDADD = ../lib/libopenflow.la -ldl $(SSL_LIBS)
 
 EXTRA_DIST = secchan.8.in
 DISTCLEANFILES = secchan.8

diff --git a/switch/Makefile.am b/switch/Makefile.am
index bd1b06e..a2d8dc5 100644 (file)
--- a/switch/Makefile.am
+++ b/switch/Makefile.am
@@ -17,7 +17,7 @@ switch_SOURCES = \
        table-hash.c \
        table-linear.c
 
-switch_LDADD = ../lib/libopenflow.la -ldl
+switch_LDADD = ../lib/libopenflow.la -ldl $(SSL_LIBS)
 
 EXTRA_DIST = switch.8.in
 DISTCLEANFILES = switch.8

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 566e2ad..48240f9 100644 (file)
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -11,7 +11,7 @@ dist_man_MANS = vlogconf.8 dpctl.8
 man_MANS = ofp-pki.8
 
 dpctl_SOURCES = dpctl.c
-dpctl_LDADD = ../lib/libopenflow.la
+dpctl_LDADD = ../lib/libopenflow.la $(SSL_LIBS)
 
 vlogconf_SOURCES = vlogconf.c
 vlogconf_LDADD = ../lib/libopenflow.la