From: Pavel Tvrdík <pawel.tvrdik@gmail.cz>
Date: Sun, 27 Sep 2015 22:18:35 +0000 (+0200)
Subject: Integrate RTRlib into BIRD's build system
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c66ced11a808d2e464667c1ca0f9cd5c9d377fb;p=thirdparty%2Fbird.git

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 cf59f7a17..0244a5630 100644
--- 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 01bb7a7c1..f19aceb24 100644
--- 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 f00c85d1e..ea05b287a 100644
--- 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@