Integrate RTRlib into BIRD's build system

You need to do manually still:
 $ cd rtrlib && cmake .

diff --git a/tools/Makefile-top.in b/tools/Makefile-top.in
index cf59f7a1742717f5d3a70e4291f7a23be6513528..0244a5630835535f80caa94fe71a662bf95bcc7b 100644 (file)
--- a/tools/Makefile-top.in
+++ b/tools/Makefile-top.in
@@ -4,6 +4,7 @@
 objdir=@objdir@
 
 all depend tags install install-docs:
+       $(MAKE) -C rtrlib
        $(MAKE) -C $(objdir) $@
 
 docs userdocs progdocs:

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 01bb7a7c1459bbbf12ba670baaf1af8e3c5cf956..f19aceb24f382516b10c3a416ca538812409df78 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -13,7 +13,7 @@ birdc: $(exedir)/birdc
 
 birdcl: $(exedir)/birdcl
 
-bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
+bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a ../rtrlib/librtr.a
 
 $(bird-dep): sysdep/paths.h .dep-stamp subdir
 

diff --git a/tools/Rules.in b/tools/Rules.in
index f00c85d1e95bcf2acb8289e3b693a1193f25b421..ea05b287a558417230c09415c649530fd39eaf0b 100644 (file)
--- a/tools/Rules.in
+++ b/tools/Rules.in
@@ -19,7 +19,7 @@ doc-dir-paths := $(doc-dirs)
 all-dirs:=$(static-dirs) $(dynamic-dirs) $(client-dirs) $(doc-dirs)
 clean-dirs:=$(all-dirs) proto sysdep
 
-CPPFLAGS=-I$(root-rel) -I$(srcdir) @CPPFLAGS@
+CPPFLAGS=-I$(root-rel) -I$(srcdir) -I$(srcdir)/rtrlib @CPPFLAGS@
 CFLAGS=$(CPPFLAGS) @CFLAGS@
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@