From 96d878178dc42839415b210c5631dc54d8eaed79 Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Tue, 4 Mar 2014 13:23:53 -0800 Subject: [PATCH] Makefile: Remove unnecessary includes of SSL_LIBS. SSL_LIBS are needed for libopenvswitch and we include that in lib/automake.mk. It is not necessary to include it for every executable. Signed-off-by: Gurucharan Shetty Acked-by: Ben Pfaff --- ovsdb/automake.mk | 6 ++--- tests/automake.mk | 58 +++++++++++++++++++++---------------------- utilities/automake.mk | 15 ++++++----- vswitchd/automake.mk | 3 +-- vtep/automake.mk | 2 +- 5 files changed, 41 insertions(+), 43 deletions(-) diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk index 69e790098..dfb900a2b 100644 --- a/ovsdb/automake.mk +++ b/ovsdb/automake.mk @@ -40,7 +40,7 @@ MAN_FRAGMENTS += \ # ovsdb-tool bin_PROGRAMS += ovsdb/ovsdb-tool ovsdb_ovsdb_tool_SOURCES = ovsdb/ovsdb-tool.c -ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la $(SSL_LIBS) +ovsdb_ovsdb_tool_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la # ovsdb-tool.1 man_MANS += ovsdb/ovsdb-tool.1 DISTCLEANFILES += ovsdb/ovsdb-tool.1 @@ -49,7 +49,7 @@ MAN_ROOTS += ovsdb/ovsdb-tool.1.in # ovsdb-client bin_PROGRAMS += ovsdb/ovsdb-client ovsdb_ovsdb_client_SOURCES = ovsdb/ovsdb-client.c -ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la $(SSL_LIBS) +ovsdb_ovsdb_client_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la # ovsdb-client.1 man_MANS += ovsdb/ovsdb-client.1 DISTCLEANFILES += ovsdb/ovsdb-client.1 @@ -58,7 +58,7 @@ MAN_ROOTS += ovsdb/ovsdb-client.1.in # ovsdb-server sbin_PROGRAMS += ovsdb/ovsdb-server ovsdb_ovsdb_server_SOURCES = ovsdb/ovsdb-server.c -ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la $(SSL_LIBS) +ovsdb_ovsdb_server_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la # ovsdb-server.1 man_MANS += ovsdb/ovsdb-server.1 DISTCLEANFILES += ovsdb/ovsdb-server.1 diff --git a/tests/automake.mk b/tests/automake.mk index 0cf45a4b8..739d79e09 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -181,38 +181,38 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac noinst_PROGRAMS += tests/test-aes128 tests_test_aes128_SOURCES = tests/test-aes128.c -tests_test_aes128_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_aes128_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-atomic tests_test_atomic_SOURCES = tests/test-atomic.c -tests_test_atomic_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_atomic_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-bundle tests_test_bundle_SOURCES = tests/test-bundle.c -tests_test_bundle_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_bundle_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-classifier tests_test_classifier_SOURCES = tests/test-classifier.c -tests_test_classifier_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_classifier_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-controller MAN_ROOTS += tests/test-controller.8.in DISTCLEANFILES += tests/test-controller.8 noinst_man_MANS += tests/test-controller.8 tests_test_controller_SOURCES = tests/test-controller.c -tests_test_controller_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_controller_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-csum tests_test_csum_SOURCES = tests/test-csum.c -tests_test_csum_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_csum_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-file_name tests_test_file_name_SOURCES = tests/test-file_name.c -tests_test_file_name_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_file_name_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-flows tests_test_flows_SOURCES = tests/test-flows.c -tests_test_flows_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_flows_LDADD = lib/libopenvswitch.la dist_check_SCRIPTS = tests/flowgen.pl noinst_PROGRAMS += tests/test-hash @@ -221,63 +221,63 @@ tests_test_hash_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-heap tests_test_heap_SOURCES = tests/test-heap.c -tests_test_heap_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_heap_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-hindex tests_test_hindex_SOURCES = tests/test-hindex.c -tests_test_hindex_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_hindex_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-hmap tests_test_hmap_SOURCES = tests/test-hmap.c -tests_test_hmap_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_hmap_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-json tests_test_json_SOURCES = tests/test-json.c -tests_test_json_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_json_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-jsonrpc tests_test_jsonrpc_SOURCES = tests/test-jsonrpc.c -tests_test_jsonrpc_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_jsonrpc_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-list tests_test_list_SOURCES = tests/test-list.c -tests_test_list_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_list_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-lockfile tests_test_lockfile_SOURCES = tests/test-lockfile.c -tests_test_lockfile_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_lockfile_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-multipath tests_test_multipath_SOURCES = tests/test-multipath.c -tests_test_multipath_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_multipath_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-packets tests_test_packets_SOURCES = tests/test-packets.c -tests_test_packets_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_packets_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-random tests_test_random_SOURCES = tests/test-random.c -tests_test_random_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_random_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-stp tests_test_stp_SOURCES = tests/test-stp.c -tests_test_stp_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_stp_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-sflow tests_test_sflow_SOURCES = tests/test-sflow.c -tests_test_sflow_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_sflow_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-netflow tests_test_netflow_SOURCES = tests/test-netflow.c -tests_test_netflow_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_netflow_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-unix-socket tests_test_unix_socket_SOURCES = tests/test-unix-socket.c -tests_test_unix_socket_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_unix_socket_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-odp tests_test_odp_SOURCES = tests/test-odp.c -tests_test_odp_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_odp_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-ovsdb tests_test_ovsdb_SOURCES = \ @@ -285,7 +285,7 @@ tests_test_ovsdb_SOURCES = \ tests/idltest.c \ tests/idltest.h EXTRA_DIST += tests/uuidfilt.pl tests/ovsdb-monitor-sort.pl -tests_test_ovsdb_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la $(SSL_LIBS) +tests_test_ovsdb_LDADD = ovsdb/libovsdb.la lib/libopenvswitch.la # idltest schema and IDL OVSIDL_BUILT += tests/idltest.c tests/idltest.h tests/idltest.ovsidl @@ -299,11 +299,11 @@ tests/idltest.c: tests/idltest.h noinst_PROGRAMS += tests/test-reconnect tests_test_reconnect_SOURCES = tests/test-reconnect.c -tests_test_reconnect_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_reconnect_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-sha1 tests_test_sha1_SOURCES = tests/test-sha1.c -tests_test_sha1_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_sha1_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-strtok_r tests_test_strtok_r_SOURCES = tests/test-strtok_r.c @@ -313,15 +313,15 @@ tests_test_type_props_SOURCES = tests/test-type-props.c noinst_PROGRAMS += tests/test-util tests_test_util_SOURCES = tests/test-util.c -tests_test_util_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_util_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-uuid tests_test_uuid_SOURCES = tests/test-uuid.c -tests_test_uuid_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_uuid_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-vconn tests_test_vconn_SOURCES = tests/test-vconn.c -tests_test_vconn_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +tests_test_vconn_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += tests/test-byte-order tests_test_byte_order_SOURCES = tests/test-byte-order.c diff --git a/utilities/automake.mk b/utilities/automake.mk index ffc48b184..d6de6a377 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -97,32 +97,31 @@ man_MANS += \ dist_man_MANS += utilities/ovs-ctl.8 utilities_ovs_appctl_SOURCES = utilities/ovs-appctl.c -utilities_ovs_appctl_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +utilities_ovs_appctl_LDADD = lib/libopenvswitch.la utilities_ovs_dpctl_SOURCES = utilities/ovs-dpctl.c -utilities_ovs_dpctl_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +utilities_ovs_dpctl_LDADD = lib/libopenvswitch.la utilities_ovs_ofctl_SOURCES = utilities/ovs-ofctl.c utilities_ovs_ofctl_LDADD = \ ofproto/libofproto.la \ - lib/libopenvswitch.la \ - $(SSL_LIBS) + lib/libopenvswitch.la utilities_ovs_vsctl_SOURCES = utilities/ovs-vsctl.c -utilities_ovs_vsctl_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +utilities_ovs_vsctl_LDADD = lib/libopenvswitch.la if LINUX_DATAPATH sbin_PROGRAMS += utilities/ovs-vlan-bug-workaround utilities_ovs_vlan_bug_workaround_SOURCES = utilities/ovs-vlan-bug-workaround.c -utilities_ovs_vlan_bug_workaround_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +utilities_ovs_vlan_bug_workaround_LDADD = lib/libopenvswitch.la noinst_PROGRAMS += utilities/nlmon utilities_nlmon_SOURCES = utilities/nlmon.c -utilities_nlmon_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +utilities_nlmon_LDADD = lib/libopenvswitch.la endif bin_PROGRAMS += utilities/ovs-benchmark utilities_ovs_benchmark_SOURCES = utilities/ovs-benchmark.c -utilities_ovs_benchmark_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +utilities_ovs_benchmark_LDADD = lib/libopenvswitch.la include utilities/bugtool/automake.mk diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk index b0a386b4e..c45d01dcb 100644 --- a/vswitchd/automake.mk +++ b/vswitchd/automake.mk @@ -14,8 +14,7 @@ vswitchd_ovs_vswitchd_SOURCES = \ vswitchd_ovs_vswitchd_LDADD = \ ofproto/libofproto.la \ lib/libsflow.la \ - lib/libopenvswitch.la \ - $(SSL_LIBS) + lib/libopenvswitch.la EXTRA_DIST += vswitchd/INTERNALS MAN_ROOTS += vswitchd/ovs-vswitchd.8.in diff --git a/vtep/automake.mk b/vtep/automake.mk index 978747d3f..f06148a40 100644 --- a/vtep/automake.mk +++ b/vtep/automake.mk @@ -11,7 +11,7 @@ man_MANS += \ vtep/vtep-ctl.8 vtep_vtep_ctl_SOURCES = vtep/vtep-ctl.c -vtep_vtep_ctl_LDADD = lib/libopenvswitch.la $(SSL_LIBS) +vtep_vtep_ctl_LDADD = lib/libopenvswitch.la # ovs-vtep scripts_SCRIPTS += \ -- 2.43.0