From: Ben Pfaff <blp@nicira.com>
Date: Mon, 21 Jul 2008 21:37:21 +0000 (-0700)
Subject: Only link programs that need it against OpenSSL.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e1d7e425482664ae0d4af88a36f2f7d9e0e8a6b;p=openvswitch

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 98a9e447..583d3eb0 100644
--- 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 1a5e01a8..8202859a 100644
--- 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 c575b479..69b605f2 100644
--- 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 bd1b06ee..a2d8dc50 100644
--- 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 566e2add..48240f92 100644
--- 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