[netfilter-cvslog] r4485 - in trunk/libnetfilter_conntrack: extensions src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-06 11:18:04 +0100 (Sun, 06 Nov 2005)
New Revision: 4485

Modified:
   trunk/libnetfilter_conntrack/extensions/Makefile.am
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
- modules don't need a 'lib' prefix
- modules need to be linked against libnetfilter_conntrack.la, otherwise they miss a dependency


Modified: trunk/libnetfilter_conntrack/extensions/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-06 09:58:03 UTC (rev 4484)
+++ trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-06 10:18:04 UTC (rev 4485)
@@ -8,14 +8,21 @@
 CFLAGS=-fPIC -Wall
 LIBS=
 
-pkglib_LTLIBRARIES = libnfct_proto_tcp.la libnfct_proto_udp.la 		\
-		     libnfct_proto_icmp.la libnfct_proto_sctp.la
+pkglib_LTLIBRARIES = nfct_proto_tcp.la nfct_proto_udp.la 		\
+		     nfct_proto_icmp.la nfct_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
+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

Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-11-06 09:58:03 UTC (rev 4484)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-11-06 10:18:04 UTC (rev 4485)
@@ -300,9 +300,9 @@
 	}
 
 	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