From f24230f9d9a3a5f875ec174d0bc5bc3e74ce7fb1 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Mon, 21 Jul 2008 14:48:53 -0700
Subject: [PATCH] Drop use of libtool for libraries.

libtool was needed when NOX was directly linking against libopenflow.
Since it doesn't do that anymore, we can drop its use (and that makes
OpenFlow configure and build slightly faster).
---
 .gitignore             |  2 --
 configure.ac           |  3 +--
 controller/Makefile.am |  2 +-
 lib/Makefile.am        | 10 +++++-----
 secchan/Makefile.am    |  2 +-
 switch/Makefile.am     |  2 +-
 tests/Makefile.am      |  4 ++--
 utilities/Makefile.am  |  4 ++--
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 03329744..ff011f2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,6 @@
 /configure-stamp
 /depcomp
 /install-sh
-/libtool
-/ltmain.sh
 /missing
 /stamp-h1
 Module.symvers
diff --git a/configure.ac b/configure.ac
index 5fea45f8..22f263d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_LD
+AC_PROG_RANLIB
 
 AC_ARG_VAR([PERL], [path to Perl interpreter])
 AC_PATH_PROG([PERL], perl, no)
@@ -14,8 +15,6 @@ fi
 
 AC_USE_SYSTEM_EXTENSIONS
 
-AC_PROG_LIBTOOL
-
 AC_ARG_ENABLE(
   [ndebug],
   [AC_HELP_STRING([--enable-ndebug], 
diff --git a/controller/Makefile.am b/controller/Makefile.am
index 84e89642..8bc15e63 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 $(SSL_LIBS)
+controller_LDADD = ../lib/libopenflow.a $(SSL_LIBS)
 
 EXTRA_DIST = controller.8.in
 controller.8: controller.8.in Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 404d925e..bedd77fa 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,8 @@
 include ../Make.vars
 
-noinst_LTLIBRARIES = libopenflow.la
+noinst_LIBRARIES = libopenflow.a
 
-libopenflow_la_SOURCES = \
+libopenflow_a_SOURCES = \
 	buffer.c \
 	command-line.c \
 	csum.c \
@@ -31,16 +31,16 @@ libopenflow_la_SOURCES = \
 	vlog.c
 
 if HAVE_NETLINK
-libopenflow_la_SOURCES += \
+libopenflow_a_SOURCES += \
 	dpif.c \
 	netlink.c \
 	vconn-netlink.c
 endif
 
 if HAVE_OPENSSL
-libopenflow_la_SOURCES += \
+libopenflow_a_SOURCES += \
 	vconn-ssl.c 
-nodist_libopenflow_la_SOURCES = dhparams.c
+nodist_libopenflow_a_SOURCES = dhparams.c
 dhparams.c: dh1024.pem dh2048.pem dh4096.pem
 	(echo '#include "dhparams.h"' &&			\
 	 openssl dhparam -C -in $(srcdir)/dh1024.pem -noout &&	\
diff --git a/secchan/Makefile.am b/secchan/Makefile.am
index a54e6d21..ebe3a784 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 $(SSL_LIBS)
+secchan_LDADD = ../lib/libopenflow.a $(SSL_LIBS)
 
 EXTRA_DIST = secchan.8.in
 DISTCLEANFILES = secchan.8
diff --git a/switch/Makefile.am b/switch/Makefile.am
index a20188ae..640c83f5 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 $(SSL_LIBS)
+switch_LDADD = ../lib/libopenflow.a $(SSL_LIBS)
 
 EXTRA_DIST = switch.8.in
 DISTCLEANFILES = switch.8
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8c5bf8dc..b542c40b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,7 +5,7 @@ TESTS = test-list
 check_PROGRAMS = test-list
 
 test_list_SOURCES = test-list.c
-test_list_LDADD = ../lib/libopenflow.la
+test_list_LDADD = ../lib/libopenflow.a
 
 TESTS += test-type-props
 check_PROGRAMS += test-type-props
@@ -13,5 +13,5 @@ test_type_props_SOURCES = test-type-props.c
 
 check_PROGRAMS += test-dhcp-client
 test_dhcp_client_SOURCES = test-dhcp-client.c
-test_dhcp_client_LDADD = ../lib/libopenflow.la
+test_dhcp_client_LDADD = ../lib/libopenflow.a
 
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 48240f92..01057f3b 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -11,10 +11,10 @@ dist_man_MANS = vlogconf.8 dpctl.8
 man_MANS = ofp-pki.8
 
 dpctl_SOURCES = dpctl.c
-dpctl_LDADD = ../lib/libopenflow.la $(SSL_LIBS)
+dpctl_LDADD = ../lib/libopenflow.a $(SSL_LIBS)
 
 vlogconf_SOURCES = vlogconf.c
-vlogconf_LDADD = ../lib/libopenflow.la
+vlogconf_LDADD = ../lib/libopenflow.a
 
 pkidir = $(pkgdatadir)/pki
 
-- 
2.30.2