[netfilter-cvslog] r4495 - in trunk/conntrack: . extensions include src

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-10 18:35:53 +0100 (Thu, 10 Nov 2005)
New Revision: 4495

Modified:
   trunk/conntrack/configure.in
   trunk/conntrack/extensions/Makefile.am
   trunk/conntrack/include/Makefile.am
   trunk/conntrack/src/conntrack.c
Log:
- rename plugisn to remove 'lib' prefix
- move them into 'pkglibdir'


Modified: trunk/conntrack/configure.in
===================================================================
--- trunk/conntrack/configure.in	2005-11-10 17:33:59 UTC (rev 4494)
+++ trunk/conntrack/configure.in	2005-11-10 17:35:53 UTC (rev 4495)
@@ -75,7 +75,7 @@
 	       NF_KERNEL_SOURCE($with_kernel),NF_KERNEL_SOURCE())
 
 if test ! -z "$libdir"; then
-   MODULE_DIR="\\\"$libdir/\\\""
+   MODULE_DIR="\\\"$libdir/conntrack/\\\""
    CFLAGS="$CFLAGS -DCONNTRACK_LIB_DIR=$MODULE_DIR"
 fi
 

Modified: trunk/conntrack/extensions/Makefile.am
===================================================================
--- trunk/conntrack/extensions/Makefile.am	2005-11-10 17:33:59 UTC (rev 4494)
+++ trunk/conntrack/extensions/Makefile.am	2005-11-10 17:35:53 UTC (rev 4495)
@@ -4,10 +4,14 @@
 CFLAGS=-fPIC -Wall
 LIBS=
 
-lib_LTLIBRARIES = libct_proto_tcp.la libct_proto_udp.la libct_proto_icmp.la \
-		  libct_proto_sctp.la
+pkglib_LTLIBRARIES = ct_proto_tcp.la ct_proto_udp.la		\
+		     ct_proto_icmp.la ct_proto_sctp.la
 
-libct_proto_tcp_la_SOURCES = libct_proto_tcp.c
-libct_proto_udp_la_SOURCES = libct_proto_udp.c
-libct_proto_icmp_la_SOURCES = libct_proto_icmp.c
-libct_proto_sctp_la_SOURCES = libct_proto_sctp.c
+ct_proto_tcp_la_SOURCES = libct_proto_tcp.c
+ct_proto_tcp_la_LDFLAGS = -module
+ct_proto_udp_la_SOURCES = libct_proto_udp.c
+ct_proto_udp_la_LDFLAGS = -module
+ct_proto_icmp_la_SOURCES = libct_proto_icmp.c
+ct_proto_icmp_la_LDFLAGS = -module
+ct_proto_sctp_la_SOURCES = libct_proto_sctp.c
+ct_proto_sctp_la_LDFLAGS = -module

Modified: trunk/conntrack/include/Makefile.am
===================================================================
--- trunk/conntrack/include/Makefile.am	2005-11-10 17:33:59 UTC (rev 4494)
+++ trunk/conntrack/include/Makefile.am	2005-11-10 17:35:53 UTC (rev 4495)
@@ -1,2 +1,2 @@
 
-include_HEADERS = libct_proto.h  linux_list.h
+pkginclude_HEADERS = conntrack.h linux_list.h

Modified: trunk/conntrack/src/conntrack.c
===================================================================
--- trunk/conntrack/src/conntrack.c	2005-11-10 17:33:59 UTC (rev 4494)
+++ trunk/conntrack/src/conntrack.c	2005-11-10 17:35:53 UTC (rev 4495)
@@ -166,9 +166,9 @@
 	}
 
 	if (!handler) {
-		char path[sizeof("libct_proto_.so")
+		char path[sizeof("ct_proto_.so")
 			 + strlen(name) + strlen(lib_dir)];
-                sprintf(path, "%s/libct_proto_%s.so", lib_dir, name);
+                sprintf(path, "%s/ct_proto_%s.so", lib_dir, name);
 		if (dlopen(path, RTLD_NOW))
 			handler = findproto(name);
 		else