summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--proto/ospf/config.Y1
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3dd163aa..6ea32414 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
objdir=obj
-all depend tags install:
+all depend tags install install-docs:
$(MAKE) -C $(objdir) $@
docs userdocs progdocs:
@@ -15,5 +15,6 @@ clean:
find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name ".#*" | xargs rm -f
distclean: clean
+ $(MAKE) -C doc distclean
rm -rf $(objdir)
rm -f config.* configure sysdep/autoconf.h sysdep/paths.h Makefile
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 9431f24c..58cde350 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -26,6 +26,7 @@ CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, RETRANSMIT)
CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, NONBROADCAST, POINTOPOINT, TYPE)
CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, PASSWORD, STRICT)
CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN)
+CF_KEYWORDS(DELAY, BROADCAST, WAIT)
%type <t> opttext