diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-10-25 01:03:52 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-10-25 01:03:52 +0000 |
| commit | b862a185d00afc5c08a5353e6bc4633818b058cc (patch) | |
| tree | 712aa647f086a4f6ef629c3e09e859ea13d21122 /Makefile | |
| parent | 586bd579d5085e1a046f1f463315281ff3f09037 (diff) | |
| download | mandoc-b862a185d00afc5c08a5353e6bc4633818b058cc.tar.gz mandoc-b862a185d00afc5c08a5353e6bc4633818b058cc.tar.zst mandoc-b862a185d00afc5c08a5353e6bc4633818b058cc.zip | |
integrate preconv(1) into mandoc(1);
enhances functionality and reduces code and docs by more than 300 lines
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.444 2014/09/27 11:20:39 kristaps Exp $ +# $Id: Makefile,v 1.445 2014/10/25 01:03:52 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -BASEBIN = mandoc preconv demandoc +BASEBIN = mandoc demandoc DBBIN = makewhatis CGIBIN = man.cgi @@ -145,7 +145,6 @@ DISTFILES = INSTALL \ mdoc.h \ msec.in \ out.h \ - preconv.1 \ predefs.in \ roff.7 \ st.in \ @@ -186,6 +185,7 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ mandoc.o \ mandoc_aux.o \ msec.o \ + preconv.o \ read.o COMPAT_OBJS = compat_fgetln.o \ @@ -226,8 +226,6 @@ MAN_OBJS = $(MANDOC_OBJS) MAKEWHATIS_OBJS = mandocdb.o mansearch_const.o manpath.o -PRECONV_OBJS = preconv.o - APROPOS_OBJS = mansearch.o mansearch_const.o manpath.o CGI_OBJS = $(MANDOC_HTML_OBJS) \ @@ -244,7 +242,6 @@ WWW_MANS = apropos.1.html \ demandoc.1.html \ man.1.html \ mandoc.1.html \ - preconv.1.html \ mandoc.3.html \ mandoc_escape.3.html \ mandoc_html.3.html \ @@ -302,7 +299,6 @@ clean: rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS) rm -f mandoc $(MANDOC_OBJS) $(APROPOS_OBJS) rm -f makewhatis $(MAKEWHATIS_OBJS) - rm -f preconv $(PRECONV_OBJS) rm -f man.cgi $(CGI_OBJS) rm -f manpage $(MANPAGE_OBJS) rm -f demandoc $(DEMANDOC_OBJS) @@ -321,7 +317,7 @@ base-install: base-build $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \ $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_MAN) man.1 mandoc.1 preconv.1 demandoc.1 \ + $(INSTALL_MAN) man.1 mandoc.1 demandoc.1 \ $(DESTDIR)$(MANDIR)/man1 $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \ mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3 @@ -386,9 +382,6 @@ mandoc: $(MAN_OBJS) libmandoc.a makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB) -preconv: $(PRECONV_OBJS) - $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS) - manpage: $(MANPAGE_OBJS) libmandoc.a $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB) |