From: pk910 <philipp@zoelle1.de>
Date: Sat, 15 Mar 2014 01:58:22 +0000 (+0100)
Subject: [IOMultiplexerV2] use libtool to generate libraries
X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=e39104fdf0cd8bd84805b39b19292caf44ce2ba7

[IOMultiplexerV2] use libtool to generate libraries
---

diff --git a/configure.ac b/configure.ac
index d6522e1..d9cdd6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 AC_CONFIG_HEADERS([config.h])
 
-#LT_INIT([disable-static])
+LT_INIT([disable-static])
 
 AC_MSG_RESULT($MODULES)
 AC_SUBST(MODULES)
@@ -19,7 +19,7 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 
 AC_ARG_ENABLE([debug],
   [AS_HELP_STRING([--enable-debug], [debug mode (compile using -O0 -Wall -Wshadow -Werror)])],
diff --git a/src/IOHandler++/.gitignore b/src/IOHandler++/.gitignore
index 95c9342..1f36bcd 100644
--- a/src/IOHandler++/.gitignore
+++ b/src/IOHandler++/.gitignore
@@ -1,5 +1,6 @@
 .deps
+.libs
 Makefile.in
 Makefile
-*.o
-*.a
+*.lo
+*.la
diff --git a/src/IOHandler++/Makefile.am b/src/IOHandler++/Makefile.am
index cb9ced4..df2e17c 100644
--- a/src/IOHandler++/Makefile.am
+++ b/src/IOHandler++/Makefile.am
@@ -1,9 +1,11 @@
 ##Process this file with automake to create Makefile.in
 ACLOCAL_AMFLAGS = -I m4
 
-noinst_LIBRARIES = libiohandler.cpp.a
+noinst_LTLIBRARIES = libiohandler.cpp.la
 
-libiohandler_cpp_a_LIBADD = ../IOHandler/libiohandler.a
-libiohandler_cpp_a_SOURCES = IOHandler.cpp \
+libiohandler_cpp_la_LIBADD = ../IOHandler/libiohandler.la
+libiohandler_cpp_la_SOURCES = IOHandler.cpp \
 IOSocket.cpp
 
+all-local: libiohandler.cpp.la
+	
\ No newline at end of file
diff --git a/src/IOHandler/.gitignore b/src/IOHandler/.gitignore
index 95c9342..1f36bcd 100644
--- a/src/IOHandler/.gitignore
+++ b/src/IOHandler/.gitignore
@@ -1,5 +1,6 @@
 .deps
+.libs
 Makefile.in
 Makefile
-*.o
-*.a
+*.lo
+*.la
diff --git a/src/IOHandler/Makefile.am b/src/IOHandler/Makefile.am
index ab0142f..14edac2 100644
--- a/src/IOHandler/Makefile.am
+++ b/src/IOHandler/Makefile.am
@@ -1,7 +1,7 @@
 ##Process this file with automake to create Makefile.in
 ACLOCAL_AMFLAGS = -I m4
 
-libiohandler_a_SOURCES = compat/utime.c \
+libiohandler_la_SOURCES = compat/utime.c \
     compat/inet.c \
     IOHandler.c \
     IODNSEngine_cares.c \
@@ -17,4 +17,4 @@ libiohandler_a_SOURCES = compat/utime.c \
     IOSSLBackend.c \
     IOTimer.c
 
-noinst_LIBRARIES = libiohandler.a
+noinst_LTLIBRARIES = libiohandler.la
diff --git a/src/IOHandler_test/resolv/Makefile.am b/src/IOHandler_test/resolv/Makefile.am
index 1dac3a5..feda450 100644
--- a/src/IOHandler_test/resolv/Makefile.am
+++ b/src/IOHandler_test/resolv/Makefile.am
@@ -2,7 +2,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_PROGRAMS = iotest
-iotest_LDADD = ../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler/libiohandler.la
 
 iotest_SOURCES = iotest.c
 
diff --git a/src/IOHandler_test/socket++/Makefile.am b/src/IOHandler_test/socket++/Makefile.am
index fdf06d3..0591fea 100644
--- a/src/IOHandler_test/socket++/Makefile.am
+++ b/src/IOHandler_test/socket++/Makefile.am
@@ -3,6 +3,5 @@ ACLOCAL_AMFLAGS = -I m4
 
 noinst_PROGRAMS = iotest
 
-iotest_LDADD = ../../IOHandler++/libiohandler.cpp.a \
-../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler++/libiohandler.cpp.la
 iotest_SOURCES = iotest.cpp
diff --git a/src/IOHandler_test/socket/Makefile.am b/src/IOHandler_test/socket/Makefile.am
index 1dac3a5..feda450 100644
--- a/src/IOHandler_test/socket/Makefile.am
+++ b/src/IOHandler_test/socket/Makefile.am
@@ -2,7 +2,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_PROGRAMS = iotest
-iotest_LDADD = ../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler/libiohandler.la
 
 iotest_SOURCES = iotest.c
 
diff --git a/src/IOHandler_test/timer/Makefile.am b/src/IOHandler_test/timer/Makefile.am
index 1dac3a5..feda450 100644
--- a/src/IOHandler_test/timer/Makefile.am
+++ b/src/IOHandler_test/timer/Makefile.am
@@ -2,7 +2,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 noinst_PROGRAMS = iotest
-iotest_LDADD = ../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler/libiohandler.la
 
 iotest_SOURCES = iotest.c