aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-03-23 12:04:54 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-03-23 12:04:54 +0000
commitcf13e4904d0a6b1b4d7a986a67750f4d2810093d (patch)
treec1af7bcaf93a73746d6b17767bbb11c8d7464117
parent9da61f6af7d4a648c5a65829c23ac4708c80fbbf (diff)
downloadmandoc-cf13e4904d0a6b1b4d7a986a67750f4d2810093d.tar.gz
mandoc-cf13e4904d0a6b1b4d7a986a67750f4d2810093d.tar.zst
mandoc-cf13e4904d0a6b1b4d7a986a67750f4d2810093d.zip
introduce mandoc_aux to 1.12
-rw-r--r--Makefile13
-rw-r--r--apropos_db.c3
-rw-r--r--mandocdb.c3
3 files changed, 13 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 1599105d..27a5f305 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,8 @@ SRCS = Makefile \
mandoc.3 \
mandoc.c \
mandoc.h \
+ mandoc_aux.c \
+ mandoc_aux.h \
mandoc_char.7 \
mandocdb.8 \
mandocdb.c \
@@ -203,6 +205,7 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
$(LIBROFF_OBJS) \
chars.o \
mandoc.o \
+ mandoc_aux.o \
msec.o \
read.o
@@ -226,7 +229,7 @@ vol.o: vol.in
$(LIBMAN_OBJS): libman.h
$(LIBMDOC_OBJS): libmdoc.h
$(LIBROFF_OBJS): libroff.h
-$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h
$(COMPAT_OBJS): config.h
MANDOC_HTML_OBJS = eqn_html.o \
@@ -253,10 +256,11 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \
main.o \
out.o \
tree.o
-$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
+$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h
MANDOCDB_OBJS = mandocdb.o manpath.o
-$(MANDOCDB_OBJS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h
+$(MANDOCDB_OBJS): mandocdb.h mandoc.h mandoc_aux.h \
+ mdoc.h man.h config.h manpath.h
PRECONV_OBJS = preconv.o
$(PRECONV_OBJS): config.h
@@ -272,7 +276,8 @@ CGI_OBJS = $(MANDOC_HTML_OBJS) \
manpath.o \
out.o \
tree.o
-$(CGI_OBJS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h manpath.h mandocdb.h
+$(CGI_OBJS): main.h mdoc.h man.h out.h config.h mandoc.h mandoc_aux.h \
+ apropos_db.h manpath.h mandocdb.h
CATMAN_OBJS = catman.o manpath.o
$(CATMAN_OBJS): config.h mandoc.h manpath.h mandocdb.h
diff --git a/apropos_db.c b/apropos_db.c
index 52b577c6..f96c94f9 100644
--- a/apropos_db.c
+++ b/apropos_db.c
@@ -1,4 +1,4 @@
-/* $Id: apropos_db.c,v 1.32.2.4 2014/01/22 21:02:54 schwarze Exp $ */
+/* $Id: apropos_db.c,v 1.32.2.5 2014/03/23 12:04:54 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -49,6 +49,7 @@
#include "mandocdb.h"
#include "apropos_db.h"
#include "mandoc.h"
+#include "mandoc_aux.h"
#define RESFREE(_x) \
do { \
diff --git a/mandocdb.c b/mandocdb.c
index 49f92125..ae30855f 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/* $Id: mandocdb.c,v 1.49.2.13 2014/03/19 22:24:12 schwarze Exp $ */
+/* $Id: mandocdb.c,v 1.49.2.14 2014/03/23 12:04:54 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
@@ -54,6 +54,7 @@
#include "man.h"
#include "mdoc.h"
#include "mandoc.h"
+#include "mandoc_aux.h"
#include "mandocdb.h"
#include "manpath.h"