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).

diff --git a/.gitignore b/.gitignore
index 0332974..ff011f2 100644 (file)
--- 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 5fea45f..22f263d 100644 (file)
--- 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 84e8964..8bc15e6 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 $(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 404d925..bedd77f 100644 (file)
--- 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 a54e6d2..ebe3a78 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 $(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 a20188a..640c83f 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 $(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 8c5bf8d..b542c40 100644 (file)
--- 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 48240f9..01057f3 100644 (file)
--- 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