Delete five standards that are:

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 7d162948ae8ab9fff982ea0ed808ca854c3dd04e..b9bf9d5dd3ae28b424fc23b78b70d33615a768a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.441 2014/08/16 23:04:25 schwarze 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
 
@@ -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 \
@@ -125,6 +124,7 @@ DISTFILES    = INSTALL \
                   main.h \
                   makewhatis.8 \
                   man-cgi.css \
+                  man.1 \
                   man.7 \
                   man.cgi.8 \
                   man.h \
@@ -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,9 +226,7 @@ MAN_OBJS     = $(MANDOC_OBJS)
 
 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 \
@@ -242,8 +240,8 @@ DEMANDOC_OBJS        = demandoc.o
 
 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 \
@@ -288,6 +286,8 @@ install: base-install $(INSTALL_TARGETS)
 
 www: $(WWW_OBJS) $(WWW_MANS)
 
+$(WWW_MANS): mandoc
+
 include Makefile.depend
 
 # === TARGETS CONTAINING SHELL COMMANDS ================================
@@ -299,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)
@@ -318,7 +317,8 @@ 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) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(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
        $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \
@@ -369,7 +369,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)
@@ -381,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)