diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-08-17 03:24:47 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-08-17 03:24:47 +0000 |
| commit | 7eba87a5fd2f971ba9c0cd6cb0db96ae643dc9e7 (patch) | |
| tree | 32368e4ff54dbb527aa87b8a65b05397b77846e9 /Makefile | |
| parent | 7d593fa69b20a5bf1d8d8b1280a0aacd5296026c (diff) | |
| download | mandoc-7eba87a5fd2f971ba9c0cd6cb0db96ae643dc9e7.tar.gz mandoc-7eba87a5fd2f971ba9c0cd6cb0db96ae643dc9e7.tar.zst mandoc-7eba87a5fd2f971ba9c0cd6cb0db96ae643dc9e7.zip | |
Fully integrate apropos(1) into mandoc(1).
Switch the argmode on the progname, including man(1).
Provide -f and -k options to switch the argmode.
Store the argmode inside struct search, generalizing the flags.
Derive the deftype from the argmode when needed instead of storing it.
Store the outkey inside struct search instead of passing it alone.
While here, get rid of the trailing blanks in Makefile.depend.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.441 2014/08/16 23:04:25 schwarze Exp $ +# $Id: Makefile,v 1.442 2014/08/17 03:24:47 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -35,8 +35,7 @@ TESTSRCS = test-dirent-namlen.c \ test-strsep.c \ test-wchar.c -SRCS = apropos.c \ - arch.c \ +SRCS = arch.c \ att.c \ cgi.c \ chars.c \ @@ -228,7 +227,7 @@ MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o PRECONV_OBJS = preconv.o -APROPOS_OBJS = apropos.o mansearch.o mansearch_const.o manpath.o +APROPOS_OBJS = mansearch.o mansearch_const.o manpath.o CGI_OBJS = $(MANDOC_HTML_OBJS) \ cgi.o \ @@ -369,7 +368,8 @@ Makefile.local config.h: configure ${TESTSRCS} depend: config.h mkdep -f Makefile.depend $(CFLAGS) $(SRCS) perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ - s|\\\n||g; s| +| |g; print;' Makefile.depend > Makefile.tmp + s|\\\n||g; s| +| |g; s| $$||mg; print;' \ + Makefile.depend > Makefile.tmp mv Makefile.tmp Makefile.depend libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) |