- modules don't need a 'lib' prefix

- modules need to be linked against libnetfilter_conntrack.la, otherwise they miss a dependency

2 files changed, 20 insertions, 13 deletions

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index e66abda..703af56 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -8,14 +8,21 @@ INCLUDES=-I../include -I${KERNELDIR}
 CFLAGS=-fPIC -Wall
 LIBS=
 
-pkglib_LTLIBRARIES = libnfct_proto_tcp.la libnfct_proto_udp.la 		\
-		     libnfct_proto_icmp.la libnfct_proto_sctp.la
-
-libnfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c 
-libnfct_proto_tcp_la_LDFLAGS = -module
-libnfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c
-libnfct_proto_udp_la_LDFLAGS = -module
-libnfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c
-libnfct_proto_icmp_la_LDFLAGS = -module
-libnfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c
-libnfct_proto_sctp_la_LDFLAGS = -module
+pkglib_LTLIBRARIES = nfct_proto_tcp.la nfct_proto_udp.la 		\
+		     nfct_proto_icmp.la nfct_proto_sctp.la
+
+nfct_proto_tcp_la_SOURCES = libnetfilter_conntrack_tcp.c 
+nfct_proto_tcp_la_LDFLAGS = -module
+nfct_proto_tcp_la_LIBADD = ../src/libnetfilter_conntrack.la
+
+nfct_proto_udp_la_SOURCES = libnetfilter_conntrack_udp.c
+nfct_proto_udp_la_LDFLAGS = -module
+nfct_proto_udp_la_LIBADD = ../src/libnetfilter_conntrack.la
+
+nfct_proto_icmp_la_SOURCES = libnetfilter_conntrack_icmp.c
+nfct_proto_icmp_la_LDFLAGS = -module
+nfct_proto_icmp_la_LIBADD = ../src/libnetfilter_conntrack.la
+
+nfct_proto_sctp_la_SOURCES = libnetfilter_conntrack_sctp.c
+nfct_proto_sctp_la_LDFLAGS = -module
+nfct_proto_sctp_la_LIBADD = ../src/libnetfilter_conntrack.la
diff --git a/src/libnetfilter_conntrack.c b/src/libnetfilter_conntrack.c
index f3086e1..7ed76c4 100644
--- a/src/libnetfilter_conntrack.c
+++ b/src/libnetfilter_conntrack.c
@@ -300,9 +300,9 @@ static struct nfct_proto *findproto(char *name)
 	}
 
 	if (!handler) {
-		char path[sizeof("libnfct_proto_.so")
+		char path[sizeof("nfct_proto_.so")
 			 + strlen(name) + strlen(lib_dir)];
-                sprintf(path, "%s/libnfct_proto_%s.so", lib_dir, name);
+                sprintf(path, "%s/nfct_proto_%s.so", lib_dir, name);
 		if (dlopen(path, RTLD_NOW))
 			handler = findproto(name);
 		else