summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-08-10 10:16:00 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2009-08-10 10:16:00 +0200
commitb92c8e30191dd757c76239076eda82d0065f2348 (patch)
tree10256b1c62f2fe346d321ec458016f384d794b65
parent54d70d3ebb20c36f483cde9d7d5b877772d4884e (diff)
parent71a9574a515613cded23b20f260a88784bcd4286 (diff)
downloadbird-b92c8e30191dd757c76239076eda82d0065f2348.tar
bird-b92c8e30191dd757c76239076eda82d0065f2348.zip
Merge branch 'master' into dev
-rw-r--r--conf/Makefile2
-rw-r--r--proto/ospf/config.Y4
-rw-r--r--tools/Makefile.in16
3 files changed, 15 insertions, 7 deletions
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
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
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