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

Merge branch 'mgorny-master'

Browse source 
https://github.com/thom311/libnl/pull/58

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-05-25 21:56:54 +02:00
commit 732c19948d
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -69,6 +69,7 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_INSTALL
AM_PROG_LIBTOOL
AC_PROG_MKDIR_P
AC_CHECK_PROGS(FLEX, 'flex')
AC_CHECK_PROGS(YACC, 'bison -y')

8
lib/Makefile.am
View file

@ -47,16 +47,16 @@ CLEANFILES = \
# Hack to avoid using ylwrap. It does not function correctly in combination
# with --header-file=
route/pktloc_grammar.c: route/pktloc_grammar.l
$(AM_V_GEN) $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
$(AM_V_GEN) $(MKDIR_P) route; $(FLEX) --header-file=route/pktloc_grammar.h $(LFLAGS) -o $@ $^
route/pktloc_syntax.c: route/pktloc_syntax.y
$(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
$(AM_V_GEN) $(MKDIR_P) route; $(YACC) -d $(YFLAGS) -o $@ $^
route/cls/ematch_grammar.c: route/cls/ematch_grammar.l
$(AM_V_GEN) $(FLEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
$(AM_V_GEN) $(MKDIR_P) route/cls; $(FLEX) --header-file=route/cls/ematch_grammar.h $(LFLAGS) -o $@ $^
route/cls/ematch_syntax.c: route/cls/ematch_syntax.y
$(AM_V_GEN) $(YACC) -d $(YFLAGS) -o $@ $^
$(AM_V_GEN) $(MKDIR_P) route/cls; $(YACC) -d $(YFLAGS) -o $@ $^
libnl_route_3_la_LIBADD = libnl-3.la
libnl_route_3_la_SOURCES = \

9
python/setup.py.in
View file

@ -3,11 +3,11 @@
from distutils.core import setup, Extension
opts = ['-O', '-nodefaultctor']
include = ['@top_builddir@/include']
include = ['@top_builddir@/include', '@top_srcdir@/include']
library_dirs = ['@top_builddir@/lib/.libs']
netlink_capi = Extension('netlink/_capi',
sources = ['netlink/capi.i'],
sources = ['@srcdir@/netlink/capi.i'],
include_dirs = include,
swig_opts = opts,
library_dirs = library_dirs,
@ -15,7 +15,7 @@ netlink_capi = Extension('netlink/_capi',
)
route_capi = Extension('netlink/route/_capi',
sources = ['netlink/route/capi.i'],
sources = ['@srcdir@/netlink/route/capi.i'],
include_dirs = include,
swig_opts = opts,
library_dirs = library_dirs,
@ -23,7 +23,7 @@ route_capi = Extension('netlink/route/_capi',
)
genl_capi = Extension('netlink/genl/_capi',
sources = ['netlink/genl/capi.i'],
sources = ['@srcdir@/netlink/genl/capi.i'],
include_dirs = include,
swig_opts = opts,
library_dirs = library_dirs,
@ -36,6 +36,7 @@ setup(name = 'netlink',
author = 'Thomas Graf',
author_email = 'tgraf@suug.ch',
ext_modules = [netlink_capi, route_capi, genl_capi],
package_dir = {'': '@srcdir@'},
packages = ['netlink', 'netlink.genl', 'netlink.route',
'netlink.route.links', 'netlink.route.qdisc'],
)