diff options
| -rw-r--r-- | extensions/Makefile.am | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/libnetfilter_conntrack.c | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 703af56..b5a343e 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -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 @@ 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_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 diff --git a/src/Makefile.am b/src/Makefile.am index a7065bd..e7d3a11 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 @@ LIBS= 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 diff --git a/src/libnetfilter_conntrack.c b/src/libnetfilter_conntrack.c index 7ed76c4..057b24d 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("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 |