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

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-11-06 12:34:35 +0100 (Sun, 06 Nov 2005)
New Revision: 4486

Modified:
   trunk/libnetfilter_conntrack/extensions/Makefile.am
   trunk/libnetfilter_conntrack/src/Makefile.am
   trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
Log:
introduce library API versioning and plugin release handling


Modified: trunk/libnetfilter_conntrack/extensions/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-06 10:18:04 UTC (rev 4485)
+++ trunk/libnetfilter_conntrack/extensions/Makefile.am	2005-11-06 11:34:35 UTC (rev 4486)
@@ -1,9 +1,5 @@
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
-EXTRA_DIST = $(man_MANS) 
-
-man_MANS =
-
 INCLUDES=-I../include -I${KERNELDIR}
 CFLAGS=-fPIC -Wall
 LIBS=
@@ -12,17 +8,17 @@
 		     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_LDFLAGS = -module -avoid-version -release $(VERSION)
 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_LDFLAGS = -module -avoid-version -release $(VERSION)
 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_LDFLAGS = -module -avoid-version -release $(VERSION)
 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_LDFLAGS = -module -avoid-version -release $(VERSION)
 nfct_proto_sctp_la_LIBADD = ../src/libnetfilter_conntrack.la

Modified: trunk/libnetfilter_conntrack/src/Makefile.am
===================================================================
--- trunk/libnetfilter_conntrack/src/Makefile.am	2005-11-06 10:18:04 UTC (rev 4485)
+++ trunk/libnetfilter_conntrack/src/Makefile.am	2005-11-06 11:34:35 UTC (rev 4486)
@@ -1,3 +1,8 @@
+
+# This is _NOT_ the library release version, it's an API version.
+# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
+LIBVERSION=1:0:0
+
 #AUTOMAKE_OPTIONS = no-dependencies foreign
 
 #EXTRA_DIST = $(man_MANS) acinclude.m4
@@ -8,5 +13,6 @@
 
 lib_LTLIBRARIES = libnetfilter_conntrack.la 
 
-libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink
+libnetfilter_conntrack_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink 	\
+				    -version-info $(LIBVERSION)
 libnetfilter_conntrack_la_SOURCES = libnetfilter_conntrack.c 

Modified: trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c
===================================================================
--- trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-11-06 10:18:04 UTC (rev 4485)
+++ trunk/libnetfilter_conntrack/src/libnetfilter_conntrack.c	2005-11-06 11:34:35 UTC (rev 4486)
@@ -300,9 +300,9 @@
 	}
 
 	if (!handler) {
-		char path[sizeof("nfct_proto_.so")
+		char path[sizeof("nfct_proto_.so") + strlen(VERSION)
 			 + strlen(name) + strlen(lib_dir)];
-                sprintf(path, "%s/nfct_proto_%s.so", lib_dir, name);
+                sprintf(path, "%s/nfct_proto_%s-%s.so", lib_dir, name, VERSION);
 		if (dlopen(path, RTLD_NOW))
 			handler = findproto(name);
 		else