diff options
author | Thomas Graf <tgraf@suug.ch> | 2010-10-14 11:56:46 (GMT) |
---|---|---|
committer | Thomas Graf <tgraf@suug.ch> | 2010-10-14 11:56:46 (GMT) |
commit | 3229b32e39363c439f0d042b561417e7b48aa786 (patch) | |
tree | 12072daf819eb7da0d91f7439df78a0371d85bdd | |
parent | 2dbc1ca76c5b82c40749e609eb83877418abb006 (diff) | |
download | libnl-3229b32e39363c439f0d042b561417e7b48aa786.zip libnl-3229b32e39363c439f0d042b561417e7b48aa786.tar.gz libnl-3229b32e39363c439f0d042b561417e7b48aa786.tar.bz2 |
- Prepare for 2.1.x tree
- Bump interface number, we will break API in the development tree
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | lib/Makefile.am | 5 | ||||
-rw-r--r-- | libnl-2.1.pc.in (renamed from libnl-2.0.pc.in) | 0 | ||||
-rw-r--r-- | src/lib/Makefile.am | 4 |
5 files changed, 5 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 8f9438c..28545fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ endif SUBDIRS = include lib doc $(OPT_DIRS) -pkgconfig_DATA = libnl-2.0.pc +pkgconfig_DATA = libnl-2.1.pc sysconfdir = @sysconfdir@/libnl sysconf_DATA = etc/pktloc diff --git a/configure.in b/configure.in index 18d2716..2d0b2dd 100644 --- a/configure.in +++ b/configure.in @@ -9,7 +9,7 @@ # Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch> # -AC_INIT(libnl, 2.0, tgraf@suug.ch) +AC_INIT(libnl, 2.1, tgraf@suug.ch) AC_CONFIG_HEADERS([lib/defs.h]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) @@ -38,5 +38,5 @@ AC_CHECK_LIB([m], [pow], [], AC_MSG_ERROR([libm is required])) AC_CONFIG_FILES([Makefile doc/Doxyfile doc/Makefile lib/Makefile include/Makefile src/Makefile src/lib/Makefile \ - libnl-2.0.pc include/netlink/version.h]) + libnl-2.1.pc include/netlink/version.h]) AC_OUTPUT diff --git a/lib/Makefile.am b/lib/Makefile.am index 92a916e..ba64a99 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,21 +1,19 @@ # -*- Makefile -*- AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\" +AM_LDFLAGS = -version-info 3:0:0 lib_LTLIBRARIES = \ libnl.la libnl-genl.la libnl-route.la libnl-nf.la -libnl_la_LDFLAGS = -version-info 2:0:0 libnl_la_SOURCES = \ addr.c attr.c cache.c cache_mngr.c cache_mngt.c data.c doc.c \ error.c handlers.c msg.c nl.c object.c socket.c utils.c -libnl_genl_la_LDFLAGS = -version-info 2:0:0 libnl_genl_la_LIBADD = libnl.la libnl_genl_la_SOURCES = \ genl/ctrl.c genl/family.c genl/genl.c genl/mngt.c -libnl_nf_la_LDFLAGS = -version-info 2:0:0 libnl_nf_la_LIBADD = libnl-route.la libnl_nf_la_SOURCES = \ netfilter/ct.c netfilter/ct_obj.c netfilter/log.c \ @@ -35,7 +33,6 @@ route/pktloc_grammar.c: route/pktloc_grammar.l route/pktloc_syntax.c: route/pktloc_syntax.y $(YACC) -d $(YFLAGS) -o $@ $^ -libnl_route_la_LDFLAGS = -version-info 2:0:0 libnl_route_la_LIBADD = libnl.la libnl_route_la_SOURCES = \ route/addr.c route/class.c route/class_api.c route/class_obj.c \ diff --git a/libnl-2.0.pc.in b/libnl-2.1.pc.in index e44f0fb..e44f0fb 100644 --- a/libnl-2.0.pc.in +++ b/libnl-2.1.pc.in diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 80c217c..2b48876 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,7 +1,7 @@ # -*- Makefile -*- AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic -AM_LDFLAGS = -L${top_builddir}/lib -ldl +AM_LDFLAGS = -L${top_builddir}/lib -ldl -version-info 3:0:0 #nobase_pkglib_LTLIBRARIES = cls/basic.la cls/ematch/cmp.la #cls_basic_la_LDFLAGS = -module -version-info 2:0:0 @@ -28,8 +28,6 @@ AM_LDFLAGS = -L${top_builddir}/lib -ldl lib_LTLIBRARIES = \ libnl-cli.la -libnl_cli_la_LDFLAGS = -version-info 2:0:0 - libnl_cli_la_LIBADD = ${top_builddir}/lib/libnl.la \ ${top_builddir}/lib/libnl-route.la \ ${top_builddir}/lib/libnl-nf.la \ |