stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- Prepare for 2.1.x tree

Browse source 
- Bump interface number, we will break API in the development tree
This commit is contained in:
Thomas Graf 2010-10-14 13:56:46 +02:00
parent 2dbc1ca76c
commit 3229b32e39
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -10,7 +10,7 @@ endif
SUBDIRS = include lib doc $(OPT_DIRS) SUBDIRS = include lib doc $(OPT_DIRS)
pkgconfig_DATA = libnl-2.0.pc pkgconfig_DATA = libnl-2.1.pc
sysconfdir = @sysconfdir@/libnl sysconfdir = @sysconfdir@/libnl
sysconf_DATA = etc/pktloc sysconf_DATA = etc/pktloc

4
configure.in
View file

@ -9,7 +9,7 @@
# Copyright (c) 2003-2010 Thomas Graf <tgraf@suug.ch> # 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_HEADERS([lib/defs.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) 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 AC_CONFIG_FILES([Makefile doc/Doxyfile doc/Makefile lib/Makefile
include/Makefile src/Makefile src/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 AC_OUTPUT

5
lib/Makefile.am
View file

@ -1,21 +1,19 @@
# -*- Makefile -*- # -*- Makefile -*-
AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)/libnl\" 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 = \ lib_LTLIBRARIES = \
libnl.la libnl-genl.la libnl-route.la libnl-nf.la libnl.la libnl-genl.la libnl-route.la libnl-nf.la
libnl_la_LDFLAGS = -version-info 2:0:0
libnl_la_SOURCES = \ libnl_la_SOURCES = \
addr.c attr.c cache.c cache_mngr.c cache_mngt.c data.c doc.c \ 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 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_LIBADD = libnl.la
libnl_genl_la_SOURCES = \ libnl_genl_la_SOURCES = \
genl/ctrl.c genl/family.c genl/genl.c genl/mngt.c 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_LIBADD = libnl-route.la
libnl_nf_la_SOURCES = \ libnl_nf_la_SOURCES = \
netfilter/ct.c netfilter/ct_obj.c netfilter/log.c \ 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 route/pktloc_syntax.c: route/pktloc_syntax.y
$(YACC) -d $(YFLAGS) -o $@ $^ $(YACC) -d $(YFLAGS) -o $@ $^
libnl_route_la_LDFLAGS = -version-info 2:0:0
libnl_route_la_LIBADD = libnl.la libnl_route_la_LIBADD = libnl.la
libnl_route_la_SOURCES = \ libnl_route_la_SOURCES = \
route/addr.c route/class.c route/class_api.c route/class_obj.c \ route/addr.c route/class.c route/class_api.c route/class_obj.c \

0
libnl-2.0.pc.in → libnl-2.1.pc.in
View file

4
src/lib/Makefile.am
View file

@ -1,7 +1,7 @@
# -*- Makefile -*- # -*- Makefile -*-
AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include -D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\" -rdynamic 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 #nobase_pkglib_LTLIBRARIES = cls/basic.la cls/ematch/cmp.la
#cls_basic_la_LDFLAGS = -module -version-info 2:0:0 #cls_basic_la_LDFLAGS = -module -version-info 2:0:0
@ -28,8 +28,6 @@ AM_LDFLAGS = -L${top_builddir}/lib -ldl
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
libnl-cli.la libnl-cli.la
libnl_cli_la_LDFLAGS = -version-info 2:0:0
libnl_cli_la_LIBADD = ${top_builddir}/lib/libnl.la \ libnl_cli_la_LIBADD = ${top_builddir}/lib/libnl.la \
${top_builddir}/lib/libnl-route.la \ ${top_builddir}/lib/libnl-route.la \
${top_builddir}/lib/libnl-nf.la \ ${top_builddir}/lib/libnl-nf.la \