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 98a9e4476011a4e0e406ccc17d34f9e680a678e6..583d3eb0f9183c6d03dceb75420ba6f1230fa88a 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 1a5e01a8efa7836caa5c15986e8f20477cb67b83..8202859a839dd9a4c2df6c76ccad1382aaea51d6 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 c575b479edb65699f3cf3035597f0b41655688b3..69b605f253ff7407531881cb5deac185eb6cc3bb 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 bd1b06ee1ed9e367983ddd79824a5c71fac93467..a2d8dc50fe52b7acbc70f44f1751ebe7ee2a762e 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 566e2addb6c9c9ec489bb288c77f17a2c11977da..48240f92f49b3d6e7e136da2fbd6eacb4fff7be1 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