projects
/
NextIRCd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd213e7
)
[IOMultiplexerV2] use libtool to generate libraries
author
pk910
<philipp@zoelle1.de>
Sat, 15 Mar 2014 01:58:22 +0000
(
02:58
+0100)
committer
pk910
<philipp@zoelle1.de>
Sat, 15 Mar 2014 01:58:22 +0000
(
02:58
+0100)
configure.ac
patch
|
blob
|
history
src/IOHandler++/.gitignore
patch
|
blob
|
history
src/IOHandler++/Makefile.am
patch
|
blob
|
history
src/IOHandler/.gitignore
patch
|
blob
|
history
src/IOHandler/Makefile.am
patch
|
blob
|
history
src/IOHandler_test/resolv/Makefile.am
patch
|
blob
|
history
src/IOHandler_test/socket++/Makefile.am
patch
|
blob
|
history
src/IOHandler_test/socket/Makefile.am
patch
|
blob
|
history
src/IOHandler_test/timer/Makefile.am
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index d6522e1ca29d3a137e8325d9a728875f1b5f1ce0..d9cdd6a4c28ddbb50187cba47517b4483768095d 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-8,7
+8,7
@@
AM_INIT_AUTOMAKE([foreign])
AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS([config.h])
AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS([config.h])
-
#
LT_INIT([disable-static])
+LT_INIT([disable-static])
AC_MSG_RESULT($MODULES)
AC_SUBST(MODULES)
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_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)])],
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 95c93429b3544ccb21f59788c8f5956013d08ba0..1f36bcd8cbe07085faa96222b366cdc8c0a62f07 100644
(file)
--- a/
src/IOHandler++/.gitignore
+++ b/
src/IOHandler++/.gitignore
@@
-1,5
+1,6
@@
.deps
.deps
+.libs
Makefile.in
Makefile
Makefile.in
Makefile
-*.o
-*.a
+*.
l
o
+*.
l
a
diff --git
a/src/IOHandler++/Makefile.am
b/src/IOHandler++/Makefile.am
index cb9ced40ddb492189b740a6f72914a9a613d7f9d..df2e17cd80c383a980d531a9a17dee5e45784a29 100644
(file)
--- 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
##Process this file with automake to create Makefile.in
ACLOCAL_AMFLAGS = -I m4
-noinst_L
IBRARIES = libiohandler.cpp.
a
+noinst_L
TLIBRARIES = libiohandler.cpp.l
a
-libiohandler_cpp_
a_LIBADD = ../IOHandler/libiohandler.
a
-libiohandler_cpp_a_SOURCES = IOHandler.cpp \
+libiohandler_cpp_
la_LIBADD = ../IOHandler/libiohandler.l
a
+libiohandler_cpp_
l
a_SOURCES = IOHandler.cpp \
IOSocket.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 95c93429b3544ccb21f59788c8f5956013d08ba0..1f36bcd8cbe07085faa96222b366cdc8c0a62f07 100644
(file)
--- a/
src/IOHandler/.gitignore
+++ b/
src/IOHandler/.gitignore
@@
-1,5
+1,6
@@
.deps
.deps
+.libs
Makefile.in
Makefile
Makefile.in
Makefile
-*.o
-*.a
+*.
l
o
+*.
l
a
diff --git
a/src/IOHandler/Makefile.am
b/src/IOHandler/Makefile.am
index ab0142fcb215a687361e70b9280f34664e0f7613..14edac2ae922a894bdba6416757cdfeb60a185a9 100644
(file)
--- 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
##Process this file with automake to create Makefile.in
ACLOCAL_AMFLAGS = -I m4
-libiohandler_a_SOURCES = compat/utime.c \
+libiohandler_
l
a_SOURCES = compat/utime.c \
compat/inet.c \
IOHandler.c \
IODNSEngine_cares.c \
compat/inet.c \
IOHandler.c \
IODNSEngine_cares.c \
@@
-17,4
+17,4
@@
libiohandler_a_SOURCES = compat/utime.c \
IOSSLBackend.c \
IOTimer.c
IOSSLBackend.c \
IOTimer.c
-noinst_L
IBRARIES = libiohandler.
a
+noinst_L
TLIBRARIES = libiohandler.l
a
diff --git
a/src/IOHandler_test/resolv/Makefile.am
b/src/IOHandler_test/resolv/Makefile.am
index 1dac3a542b2b9008fe8a3e83465e025f20c72d8f..feda450aef9fdfdecf5f23c7a196783ba74b308c 100644
(file)
--- 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
ACLOCAL_AMFLAGS = -I m4
noinst_PROGRAMS = iotest
-iotest_LDADD = ../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler/libiohandler.
l
a
iotest_SOURCES = iotest.c
iotest_SOURCES = iotest.c
diff --git
a/src/IOHandler_test/socket++/Makefile.am
b/src/IOHandler_test/socket++/Makefile.am
index fdf06d388df682233f6673472fdaedff4d7dfdbf..0591fea0fb1f326035c15b1c42ac9a4bdd4a01a4 100644
(file)
--- 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
noinst_PROGRAMS = iotest
-iotest_LDADD = ../../IOHandler++/libiohandler.cpp.a \
-../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler++/libiohandler.cpp.la
iotest_SOURCES = iotest.cpp
iotest_SOURCES = iotest.cpp
diff --git
a/src/IOHandler_test/socket/Makefile.am
b/src/IOHandler_test/socket/Makefile.am
index 1dac3a542b2b9008fe8a3e83465e025f20c72d8f..feda450aef9fdfdecf5f23c7a196783ba74b308c 100644
(file)
--- 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
ACLOCAL_AMFLAGS = -I m4
noinst_PROGRAMS = iotest
-iotest_LDADD = ../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler/libiohandler.
l
a
iotest_SOURCES = iotest.c
iotest_SOURCES = iotest.c
diff --git
a/src/IOHandler_test/timer/Makefile.am
b/src/IOHandler_test/timer/Makefile.am
index 1dac3a542b2b9008fe8a3e83465e025f20c72d8f..feda450aef9fdfdecf5f23c7a196783ba74b308c 100644
(file)
--- 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
ACLOCAL_AMFLAGS = -I m4
noinst_PROGRAMS = iotest
-iotest_LDADD = ../../IOHandler/libiohandler.a
+iotest_LDADD = ../../IOHandler/libiohandler.
l
a
iotest_SOURCES = iotest.c
iotest_SOURCES = iotest.c