=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.342 retrieving revision 1.346 diff -u -p -r1.342 -r1.346 --- mandoc/Makefile 2011/05/24 21:18:06 1.342 +++ mandoc/Makefile 2011/05/26 20:22:42 1.346 @@ -32,7 +32,7 @@ INSTALL_DATA = $(INSTALL) -m 0444 INSTALL_LIB = $(INSTALL) -m 0644 INSTALL_MAN = $(INSTALL_DATA) -all: mandoc +all: mandoc preconv SRCS = Makefile \ arch.c \ @@ -88,6 +88,8 @@ SRCS = Makefile \ msec.in \ out.c \ out.h \ + preconv.1 \ + preconv.c \ predefs.in \ read.c \ roff.7 \ @@ -228,6 +230,11 @@ MAKEWHATIS_LNS = makewhatis.ln $(MAKEWHATIS_OBJS) $(MAKEWHATIS_LNS): mandoc.h mdoc.h man.h config.h +PRECONV_OBJS = preconv.o +PRECONV_LNS = preconv.ln + +$(PRECONV_OBJS) $(PRECONV_LNS): config.h + INDEX_MANS = makewhatis.1.html \ makewhatis.1.xhtml \ makewhatis.1.ps \ @@ -263,6 +270,11 @@ INDEX_MANS = makewhatis.1.html \ mdoc.7.ps \ mdoc.7.pdf \ mdoc.7.txt \ + preconv.1.html \ + preconv.1.xhtml \ + preconv.1.ps \ + preconv.1.pdf \ + preconv.1.txt \ roff.7.html \ roff.7.xhtml \ roff.7.ps \ @@ -292,6 +304,8 @@ clean: rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS) rm -f makewhatis $(MAKEWHATIS_OBJS) rm -f llib-lmakewhatis.ln $(MAKEWHATIS_LNS) + rm -f preconv $(PRECONV_OBJS) + rm -f llib-lpreconv.ln $(PRECONV_LNS) rm -f mandoc $(MANDOC_OBJS) rm -f llib-lmandoc.ln $(MANDOC_LNS) rm -f config.h config.log compat.o compat.ln @@ -306,10 +320,10 @@ install: all mkdir -p $(DESTDIR)$(MANDIR)/man1 mkdir -p $(DESTDIR)$(MANDIR)/man3 mkdir -p $(DESTDIR)$(MANDIR)/man7 - $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR) + $(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR) $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) $(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) mandoc.1 preconv.1 $(DESTDIR)$(MANDIR)/man1 $(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3 $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) @@ -333,15 +347,21 @@ llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS) mandoc: $(MANDOC_OBJS) libmandoc.a $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a +llib-lmandoc.ln: $(MANDOC_LNS) + $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS) + # You'll need -ldb for Linux. makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a -llib-lmandoc.ln: $(MANDOC_LNS) - $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS) - llib-lmakewhatis.ln: $(MAKEWHATIS_LNS) $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS) + +preconv: $(PRECONV_OBJS) + $(CC) -o $@ $(PRECONV_OBJS) + +llib-lpreconv.ln: $(PRECONV_LNS) + $(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS) mdocml.md5: mdocml.tar.gz md5 mdocml.tar.gz >$@