From 0d328932be54a6756c6b43b0cd6d8d314a5b7fe2 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Thu, 30 Jul 2009 18:39:41 +0200
Subject: Symbols PASSWORDS and BROADCAST not declared for OSPF

---
 proto/ospf/config.Y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 77ca26c..5fe8257 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -34,11 +34,11 @@ finish_iface_config(struct ospf_iface_patt *ip)
 
 CF_DECLS
 
-CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG)
+CF_KEYWORDS(OSPF, AREA, OSPF_METRIC1, OSPF_METRIC2, OSPF_TAG, BROADCAST)
 CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, RETRANSMIT)
 CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, NONBROADCAST, POINTOPOINT, TYPE)
 CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC)
-CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, LINK)
+CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, LINK, PASSWORDS)
 CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY)
 
 %type <t> opttext
-- 
cgit v1.2.3


From 0ac39033c7470f7301bb108f8e777c7ce6af273f Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Sun, 9 Aug 2009 19:43:15 +0200
Subject: Missing dependency added.

---
 conf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/Makefile b/conf/Makefile
index dae3dd1..1b8bc71 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -23,7 +23,7 @@ keywords.h: $(conf-fragments) $(conf-src)/gen_keywords.m4
 commands.h: $(conf-fragments) $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4
 	$(M4) -P $(conf-src)/gen_commands.m4 $(srcdir)/client/cmds.m4 $(conf-fragments) | sort >commands.h
 
-cf-lex.c: cf-lex.l
+cf-lex.c: cf-lex.l cf-parse-tab.h
 	$(FLEX) $(FLEX_DEBUG) -s -B -8 -ocf-lex.c -Pcf_ cf-lex.l
 
 depend: keywords.h commands.h cf-parse.tab.c cf-lex.c
-- 
cgit v1.2.3


From 71a9574a515613cded23b20f260a88784bcd4286 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@majklik.network.cz>
Date: Sun, 9 Aug 2009 19:43:42 +0200
Subject: Makefile changed to make it work with 'make -jN' where N>1

---
 tools/Makefile.in | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6307cf0..eeef8f5 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -11,17 +11,25 @@ daemon: $(exedir)/bird
 
 client: $(exedir)/birdc
 
-subdir depend: .dir-stamp
+bird-dep := $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
+
+$(bird-dep): sysdep/paths.h .dep-stamp subdir
+
+birdc-dep := client/all.o lib/birdlib.a
+
+$(birdc-dep): sysdep/paths.h .dep-stamp subdir
+
+subdir depend: sysdep/paths.h .dir-stamp
 	set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
 	set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
 
-$(exedir)/bird: $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
+$(exedir)/bird: $(bird-dep)
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
-$(exedir)/birdc: client/all.o lib/birdlib.a
+$(exedir)/birdc: $(birdc-dep)
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
 
-.dir-stamp:
+.dir-stamp: sysdep/paths.h
 	mkdir -p $(static-dirs) $(client-dirs) $(doc-dirs)
 	touch .dir-stamp
 
-- 
cgit v1.2.3